fix shajiang

Service.js

@@ -1275,9 +1275,15 @@ class Service{
 
         if (yuban.length > 0) {//处理预拌砂浆
             if (yuban.includes('1')) {//与换无关
+		let hanliang = 0;
+                for(let i = 1; i < data_normal.length; i++) {
+                    if (data_normal[i][2].includes('砂浆') && !data_normal[i][2].includes('搅拌机')) {
+                        hanliang = Number(data_normal[i][10])
+                    }
+                }
                 for(let i = 1; i < data_normal.length; i++) {
                     if (data_normal[i][4]=='工日') {
-                        data_normal[i][10] = Number(data_normal[i][10]) - 0.45;
+                        data_normal[i][10] = Number(data_normal[i][10]) - 0.45 * hanliang;
                     }
                     if (data_normal[i][2].includes('搅拌机')) {
                         data_normal[i][10] = 0;
@@ -1300,10 +1306,16 @@ class Service{
             } else if (yuban.includes('2')) {//与换无关
                 
                 let added = [];
+		let hanliang = 0;
+                for(let i = 1; i < data_normal.length; i++) {
+                  if (data_normal[i][2].includes('砂浆') && !data_normal[i][2].includes('搅拌机')) {
+                    hanliang = Number(data_normal[i][10]); 
+                  }
+                }
                 for(let i = 1; i < data_normal.length; i++) {
                   let origin = 0;
                   if (data_normal[i][4]=='工日') {
-                    data_normal[i][10] = Number(data_normal[i][10]) - 0.3;
+                    data_normal[i][10] = Number(data_normal[i][10]) - 0.3 * hanliang;
                   }
                   if (data_normal[i][2].includes('搅拌机')) {
                     data_normal[i][10] = 0;
@@ -1312,6 +1324,7 @@ class Service{
                     data_normal[i][2] = data_normal[i][2].concat('（干拌（混）砂浆）');
                     origin = Number(data_normal[i][10]); 
                     data_normal[i][10] = origin * 1.75;
+	            data_normal[i][4] = 't';
                     added.push(['', 'S00001', '水', '', 't', '4.70', '', '', '2', 'false', (origin * 0.29).toString(), ''/**hj */, ''/**zgj */,''/**zycl */,''/**zc */,''/**sb */,'',data_normal[i][17]]);
                     added.push(['', 'JD0001', '其他机械费（电）', '', '度', '0.65', '', '', '3', 'false', (origin * 2.15).toString(), ''/**hj */, ''/**zgj */,''/**zycl */,''/**zc */,''/**sb */, '',data_normal[i][17]]);
     
@@ -1333,15 +1346,22 @@ class Service{
 
             } else if (yuban.includes('3')) {//与换无关
                 let added = [];
+		let hanliang = 0;
+                for(let i = 1; i < data_normal.length; i++) {
+                  if (data_normal[i][2].includes('砂浆') && !data_normal[i][2].includes('搅拌机')) {
+                    hanliang = Number(data_normal[i][10]); 
+                  }
+                }
                 for(let i = 1; i < data_normal.length; i++) {
                   let origin = 0;
                   if (data_normal[i][4]=='工日') {
-                    data_normal[i][10] = Number(data_normal[i][10]) - 0.2;
+                    data_normal[i][10] = Number(data_normal[i][10]) - 0.2 * hanliang;
                   } 
                   if (data_normal[i][2].includes('砂浆') && !data_normal[i][2].includes('搅拌机')) {
                     data_normal[i][2] = data_normal[i][2].concat('（干拌（混）砂浆）');
                     origin = Number(data_normal[i][10]); 
                     data_normal[i][10] = origin * 1.75;
+		    data_normal[i][4] = 't';
                     added.push(['', 'S00001', '水', '', 't', '4.70', '', '', '2', 'false', (origin * 0.29).toString(), '', '','','','','',data_normal[i][17]]);
 
                   }

tasks2.py

@@ -44,8 +44,7 @@ def process_data(data:dict)-> dict:
         maxN = maxN + 1
         url = 'http://0.0.0.0:8000/submit/'
         qd_ = qdcollection.find_one({'biao_id': data['name'], 'Dwgcbh': data['detail'], '清单编码': entry})
-        if int(qd_['序号'])<89:
-            continue
+        print('SUBMIT '+qd_['序号'])
         response = requests.post(url, json={
           'bianma': entry,
           'mc': qd_['名称'],
@@ -66,11 +65,13 @@ def process_data(data:dict)-> dict:
             time.sleep(10)
             elapse = elapse + 10
             response = requests.get('http://0.0.0.0:8000/check/'+id_)
-            text = json.loads(response.text)
+            try:
+                text = json.loads(response.text)
+            except:
+                break
             result = text['result']
             if text['status'] in ['SUCCESS', 'FAILURE']:
                 break
-        print(text['status'])
         if result is not None and text['status'] == 'SUCCESS':
             qds2[entry]=1
             result['result'][0]['biao_id'] = qd_['biao_id']
@@ -82,7 +83,8 @@ def process_data(data:dict)-> dict:
             })
             print(response.text)
         else:
-            print('任务异常')
+            print(qd_['序号'])
+            print('异常')
             qds2[entry]=-1
         result = dbcollection.update_one({'biao_id': data['name'], 'Dwgcbh': data['detail']},
             {'$set': {'qd_detail': qds2}})