|
|
@@ -1397,6 +1397,7 @@ async def zongjiaDwgc(client, biao_id, bh):
|
|
|
jxf_sum = 0
|
|
|
glf_sum = 0
|
|
|
lr_sum = 0
|
|
|
+ fbrgycl_sum = 0
|
|
|
async for post in collection.find({'biao_id': biao_id, "Dwgcbh": bh}, {'__children': 0}):
|
|
|
qd_sum = qd_sum + float(post['合价'])
|
|
|
rgf_sum = rgf_sum + float(post['数量']) * float(post['人工费'])
|
|
|
@@ -1410,6 +1411,9 @@ async def zongjiaDwgc(client, biao_id, bh):
|
|
|
sum = qd_sum + djcs_sum
|
|
|
collection = db['Dwgc']
|
|
|
document = await collection.find_one({'biao_id': biao_id, "Dwgcbh": bh}, {'rcjhz': 0})
|
|
|
+ fbrgycl = document['fbrgycl']
|
|
|
+ for entry in fbrgycl:
|
|
|
+ fbrgycl_sum = fbrgycl_sum + float(entry['合价'])
|
|
|
zjcs = document['zjcs']
|
|
|
def process(n):
|
|
|
n['计算基数'] = str(sum)
|
|
|
@@ -1452,7 +1456,7 @@ async def zongjiaDwgc(client, biao_id, bh):
|
|
|
item['金额'] = str(gf_sum)
|
|
|
for item in gfsj:
|
|
|
if item['名称'] == '税金':
|
|
|
- item['取费基数'] = str(sum + zjcs_sum + qtxm_sum + gf_sum)
|
|
|
+ item['取费基数'] = str(sum + zjcs_sum + qtxm_sum + gf_sum - fbrgycl_sum / float(1.01))
|
|
|
item['金额'] = float(item['取费基数']) * float(item['费率']) / float(100)
|
|
|
sj_sum = float(item['金额'])
|
|
|
for item in gfsj:
|
