流程五脚本编写

air_case/b5_spd3_core_business_flow/a_a9流程六_中心库入库结算_负结算.air/a_a9流程六_中心库入库结算_负结算.py

@@ -196,19 +196,19 @@ def center_warehouse_return():
 
 
 try:
-    # test1()
+    # test1() # 提交采购计划   # 外网配送   # 内网验收入库结算
     # 先查询所有的部门信息写入文件
     # dept_query_all()
     # 设置库房人员，根据传入的科室id和科室名称来设置库房
     # 中心库type=1 二级type=2三级type=3
     # set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'],2)
     # set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3)
-    # center_warehouse_return()
+    center_warehouse_return()
     OBh_ID=settle()  # 生成结算单
     print(OBh_ID)
     # 调用审批结算单
-    approval_center()
-    # invoice()
+    approval_center(OBh_ID)
+    invoice(2,OBh_ID)#type=2 传递结算单号，外网查询
     commonFuc().check_text_exist_result_text('succeed', 'succeed')
 except:
     commonFuc().check_text_exist_result_text('error', '1')

air_case/public1/public1/public1.py

@@ -476,7 +476,7 @@ def get_udi(type=1):
     titlename = ('list_a', 'list_b', 'list_c')
     # 将条码信息写入文件
     FileUtils().w_info8(info, module, '条码信息', titlename, 'message18')
-def invoice():
+def invoice(type=1,OBh_ID='OBh0347202404280009'):
     # # 登录获取用户id等信息，使用创建的用户登录===========开始
     info = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message')
     # print(info)
@@ -493,10 +493,14 @@ def invoice():
     headers = commonFuc().get_business_data(module, "json_headers2",
                                             commonFuc().get_business_data(module, "json_contentType"), token,
                                             projectCode)
+    if type==1:
+        request_body = commonFuc().get_business_data(module, "payload2_1_1", get_hosid(), get_branch_id())
+    elif type==2:
+        request_body = commonFuc().get_business_data(module, "payload2_1_2", get_hosid(), get_branch_id(),OBh_ID)
+    else:
+        request_body = commonFuc().get_business_data(module, "payload2_1_1", get_hosid(), get_branch_id())
 
-    request_body = commonFuc().get_business_data(module, "payload2_1_1", get_hosid(), get_branch_id())
-
-    # print('request_body',request_body)
+    print('request_body_发票录入列表查询',request_body)
     # 发送请求
     i=1
     while True:
@@ -541,7 +545,7 @@ def invoice():
     info = FileUtils().r_info8(module, "结算开票信息", 'message')
     # print('info', info)
     list_a = info['list_a']
-    print('list_a', list_a,type(list_a),len(list_a))
+    # print('list_a', list_a,type(list_a),len(list_a))
     pid='pid'
     settleMonth = "settleMonth"
     hosGoodsId = 'hosGoodsId'

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202404280038
-  cname: 国药集团公司yiTfc
+  e_id: CR202404280057
+  cname: 国药集团公司u)cyX

data/a3_mdm3_hs/message

 医院信息:
-  h_id: 湖南省人民医院qBzGT
-  h_name: 湖南省人民医院qBzGT
+  h_id: 湖南省人民医院0XItm
+  h_name: 湖南省人民医院0XItm

data/a5_mdm3_pdm/message2

 产品审核信息:
-  MSPid: MSP2404280011_1
+  MSPid: MSP2404280016_1
   hosId: h0347
-  hosGoodsId: h034700003207
-  provGoodsid: provGood-99220316
-  goodsAuditBillId: MSP2404280011
-  targetId: MSP2404280011_1
+  hosGoodsId: h034700003212
+  provGoodsid: provGood-99220321
+  goodsAuditBillId: MSP2404280016
+  targetId: MSP2404280016_1

data/a6_mdm3_si/data

@@ -27,6 +27,7 @@ json_headers2: {
 "payload1": {"pageNum":1,"pageSize":50,"queryObject":{"id":"%s","hosVersion":3}}
 "payload2": {"pageNum":1,"pageSize":50,"queryObject":{"hosId":"h0347","branchId":"h0347-2011","pid":"","hosVersion":"3"}}
 "payload2_1_1": {"pageNum":1,"pageSize":50,"queryObject":{"hosId":"%s","branchId":"%s","pid":"","hosVersion":"3"}}
+"payload2_1_2": {"pageNum":1,"pageSize":50,"queryObject":{"hosId":"%s","branchId":"%s","pid":"%s","hosVersion":"3"}}
 
 "payload3": {"settleMonth":"%s","hosGoodsId":"%s","batchCode":"%s","distrDetailId":"%s","distrId":"%s","distrOrderNo":"%s","settlePrice":2.3,"maxSettleQty":0.0,"maxSettleAmount":0.0,"curSettleQty":0.0,"curSettleAmount":0.0,"leftSettleQty":33,"leftSettleAmount":"%s","hosId":"%s","provId":"%s","branchId":"%s","balanceDetId":"%s","purMode":"%s","barCode":"%s","batchId":null,"price":null,"maxQty":null,"settleQty":null,"id":null,"hosVersion":null,"jsonData":null}
 "payload3_1": {"settleMonth":"%s","hosGoodsId":"%s","batchCode":"%s","distrDetailId":"%s","distrId":"%s","distrOrderNo":"%s","settlePrice":2.3,"maxSettleQty":33,"maxSettleAmount":75.9,"curSettleQty":33,"curSettleAmount":75.89999999999999,"leftSettleQty":33,"leftSettleAmount":75.9,"hosId":"%s","provId":"%s","branchId":"%s","balanceDetId":"%s","purMode":10,"barCode":"%s","batchId":null,"price":null,"maxQty":null,"settleQty":null,"id":null,"hosVersion":null,"jsonData":null}

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3536
-  branch_name: 东土城路院区1oGfD
+  branch_id: h0347-3537
+  branch_name: 东土城路院区NFX^(
 科室信息:
-  dept2_id: 010a616a153347d58c42f99cba041e08
+  dept2_id: 0b1dbf8c875c4362b174a6445a69a41e
   dept2_name: 二级检验科002

report/summary.html

@@ -56,7 +56,7 @@
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>0分4秒</td>
+            <td class='details-col-elapsed'>0分51秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -74,7 +74,7 @@
         <tr width="600">
             <td class="details-col-elapsed"><a href='../log/a_a9流程六_中心库入库结算_负结算/log.html' target='_blank'>a_a9流程六_中心库入库结算_负结算</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">4.716</td>
+            <td class="details-col-elapsed">51.496</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>