处理发包人供应材料to be continue

subdir/db.py

@@ -1663,7 +1663,16 @@ async def save(client, data):
         rcjhz = rcjhz + qdrcj
     newHuizong = util.huizongrcj(rcjhz)
     collection = db["Dwgc"]
-    await collection.update_one({'biao_id': biao_id, 'Dwgcbh': bh}, {'$set': {'rcjhz' : newHuizong}})
+    document = await collection.find_one({'biao_id': biao_id,'Dwgcbh': bh})
+    fbrgycl = document['fbrgycl']
+    for entry in fbrgycl:
+        id = entry['材料编号']
+        for entry2 in newHuizong:
+            if entry2[1] == id:
+                entry['数量'] = entry2[5]
+                entry['合价'] = entry2[7]
+
+    await collection.update_one({'biao_id': biao_id, 'Dwgcbh': bh}, {'$set': {'rcjhz' : newHuizong, 'fbrgycl': fbrgycl}})
     await zongjiaDwgc(client, biao_id, bh)
     await tbxx(client, biao_id)
     return {"result": "ok"}
@@ -1699,7 +1708,16 @@ async def savedjcs(client, data):
         rcjhz = rcjhz + qdrcj
     newHuizong = util.huizongrcj(rcjhz)
     collection = db["Dwgc"]
-    await collection.update_one({'biao_id': biao_id, 'Dwgcbh': bh}, {'$set': {'rcjhz' : newHuizong}})
+    document = await collection.find_one({'biao_id': biao_id,'Dwgcbh': bh})
+    fbrgycl = document['fbrgycl']
+    for entry in fbrgycl:
+        id = entry['材料编号']
+        for entry2 in newHuizong:
+            if entry2[1] == id:
+                entry['数量'] = entry2[5]
+                entry['合价'] = entry2[7]
+
+    await collection.update_one({'biao_id': biao_id, 'Dwgcbh': bh}, {'$set': {'rcjhz' : newHuizong, 'fbrgycl': fbrgycl}})
     await zongjiaDwgc(client, biao_id, bh)
     await tbxx(client, biao_id)
     return {"result": "ok"}
@@ -2129,8 +2147,16 @@ async def tiaojia(client, biao_id, bh, bm, mingcheng, danwei, jiage, glf, lr, bz
         rcjhz = rcjhz + qdrcj
     newHuizong = util.huizongrcj(rcjhz)
     collection = db["Dwgc"]
-    #document = await collection.find_one({'biao_id': biao_id, "Dwgcbh": bh})
-    await collection.update_one({'biao_id': biao_id, "Dwgcbh": bh}, {'$set': {'rcjhz': newHuizong}})
+    document = await collection.find_one({'biao_id': biao_id,'Dwgcbh': bh})
+    fbrgycl = document['fbrgycl']
+    for entry in fbrgycl:
+        id = entry['材料编号']
+        for entry2 in newHuizong:
+            if entry2[1] == id:
+                entry['数量'] = entry2[5]
+                entry['合价'] = entry2[7]
+
+    await collection.update_one({'biao_id': biao_id, "Dwgcbh": bh}, {'$set': {'rcjhz': newHuizong, 'fbrgycl': fbrgycl}})
     await zongjiaDwgc(client, biao_id, bh)
     await tbxx(client, biao_id)
     return newHuizong