流程十一脚本编写

air_case/b5_spd3_core_business_flow/a_a8流程五_中心库入库结算_正结算3_外网开票.air/a_a8流程五_中心库入库结算_正结算3_外网开票.py

@@ -169,8 +169,8 @@ def invoice():
     invoiceQty = leftSettleQty
     invoiceAmount = leftSettleAmount
     invoiceDate = timeUtils().get_time_hms(5)
-    request_body = commonFuc().get_business_data(module, "payload3_2_2_2", hosName, invoiceQty, invoiceAmount,
-                                                 invoiceDate, hosId, hosVersion)
+    request_body = commonFuc().get_business_data(module, "payload3_2_2_2_1", hosName, invoiceQty, invoiceAmount,
+                                                 invoiceDate, hosId, provId,hosVersion)
     print('发票缓存提交request_body', request_body)
     # 发送请求
     result = commonFuc().http_post(url, request_body, headers)

air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air/a_b5流程十二请领业务流_二级库向二级库.py

@@ -414,7 +414,6 @@ def pick_execute():
         # 提交领用出库单
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                                  "herpService_stock_out_use_submit_url")
-        url = url + BH_ID
         print('提交拣货执行单=================', url)
         if purMode == 10:
             request_body = commonFuc().get_business_data(module, "payload51_1_1", targetAreaCode,sourceId)

air_case/public1/public1/public1.py

@@ -2501,7 +2501,7 @@ def pickScan2(PICK_ID, udi_code, type=1):  # 二级库出库拣货扫码
     # # # # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
     print('result', result)
-    return  areaCode,PICK_ID
+    return  areaCode,pickerId
 
 
 def get_branch_name():

data/a6_mdm3_si/data

@@ -37,6 +37,7 @@ json_headers2: {
 
 "payload3_2": {"hosName":"邹城市人民医院(test)","invoiceQty":33,"invoiceAmount":"75.9000","invoiceNumber":"1","invoiceCode":"1","invoiceNum":1,"remarks":"","invoiceTagList":[],"attachmentList":[],"hosId":"h0347","provId":null,"hosVersion":"3"}
 "payload3_2_2_2": {"hosName":"%s","invoiceQty":"%s","invoiceAmount":"%s","invoiceNumber":"%s","invoiceCode":"%s","invoiceNum":1,"remarks":"","invoiceDate":"%sT08:23:22.467Z","invoiceTagList":[],"attachmentList":[],"hosId":"%s","hosVersion":"%s"}
+"payload3_2_2_2_1": {"hosName":"%s","invoiceQty":"%s","invoiceAmount":"%s","invoiceNumber":"%s","invoiceCode":"%s","invoiceNum":1,"remarks":"","invoiceDate":"%sT05:43:06.802Z","invoiceTagList":[],"attachmentList":[],"hosId":"%s","provId":"%s","hosVersion":3,"splitFlag":false}
 
 "payload3_3": {"pageNum":1,"pageSize":50,"queryObject":{"invoiceNumber":"","invoiceDate1":"","invoiceDate2":"","tbStatus":0}}
 "payload3_3_1": {"pageNum":1,"pageSize":50,"queryObject":{"invoiceNumber":"","createDate1":"","createDate2":"","tbStatus":1}}

data/a6_mdm3_si/message

@@ -2,44 +2,44 @@
   list_a:
   - &id001
     settleMonth: '202406'
-    pid: OBh0347202406030004
-    hosGoodsId: h034700003964
-    goodsCode: '00003964'
-    goodsName: 一次性注射器_低值qjUa2
+    pid: OBh0347202406030032
+    hosGoodsId: h034700003963
+    goodsCode: '00003963'
+    goodsName: 高值牙钻机^A%aM
     goodsGg: G-31891
     mfrsName: 德国歌德公司 Geuder AG
     unit: 支
-    leftSettleAmount: 0.0
+    leftSettleAmount: 99.9999
     batchCode:
     kindName:
     factName:
-    cacheleftAmount: 19999.98
-    purMode: 10
-    waitInvoicingNum: 0.0
+    cacheleftAmount: 99.9999
+    purMode: 20
+    waitInvoicingNum: 1.0
     invoicingPrice:
     normalContractId:
     normalContract: '1'
     detailList:
-    - pid: OBh0347202406030004
+    - pid: OBh0347202406030032
       settleMonth: '202406'
-      hosGoodsId: h034700003964
-      batchCode: '333'
-      distrDetailId: '03837924'
-      distrId: PSh0347202406030005
-      distrOrderNo: PSh0347202406030005
+      hosGoodsId: h034700003963
+      batchCode: '222'
+      distrDetailId: '03837970'
+      distrId: PSh0347202406030047
+      distrOrderNo: PSh0347202406030047
       settlePrice: 99.9999
-      maxSettleQty: -100.0
-      maxSettleAmount: -9999.99
-      curSettleQty: -100.0
-      curSettleAmount: -9999.99
-      leftSettleQty: -100.0
-      leftSettleAmount: -9999.99
+      maxSettleQty: 1.0
+      maxSettleAmount: 99.9999
+      curSettleQty: 1.0
+      curSettleAmount: 99.9999
+      leftSettleQty: 1.0
+      leftSettleAmount: 99.9999
       hosId: h0347
       provId: p1e267
       branchId: h0347-3649
-      balanceDetId: OBh0347202406030004-000001
-      purMode: 10
-      barCode: 013649000003964010333112406031724121021UT240603000202
+      balanceDetId: OBh0347202406030032-000002
+      purMode: 20
+      barCode: '0100000000003963102221124060317241210218800000001060869'
       batchId:
       price:
       maxQty:
@@ -52,43 +52,10 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202406OBh0347202406030004h034700003964
-    - pid: OBh0347202406030004
-      settleMonth: '202406'
-      hosGoodsId: h034700003964
-      batchCode: '333'
-      distrDetailId: '03837924'
-      distrId: PSh0347202406030005
-      distrOrderNo: PSh0347202406030005
-      settlePrice: 99.9999
-      maxSettleQty: 100.0
-      maxSettleAmount: 9999.99
-      curSettleQty: 100.0
-      curSettleAmount: 9999.99
-      leftSettleQty: 100.0
-      leftSettleAmount: 9999.99
-      hosId: h0347
-      provId: p1e267
-      branchId: h0347-3649
-      balanceDetId: OBh0347202406030004-000002
-      purMode: 10
-      barCode: 013649000003964010333112406031724121021UT240603000288
-      batchId:
-      price:
-      maxQty:
-      settleQty:
-      id:
-      hosVersion:
-      jsonData:
-      oneFcatId:
-      oneFcatName:
-      volumeFlag:
-      onlineKind:
-      invoicePrice: 99.9999
-      viewId: 202406OBh0347202406030004h034700003964
-    unique: 202406OBh0347202406030004h034700003964
+      viewId: 202406OBh0347202406030032h034700003963
+    unique: 202406OBh0347202406030032h034700003963
     onlineKind: '10'
-    viewId: 202406OBh0347202406030004h034700003964
+    viewId: 202406OBh0347202406030032h034700003963
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202406030034
-  distrBillId2: PSh0347202406030034
+  distrBillId1: PSh0347202406030052
+  distrBillId2: PSh0347202406030052
 高值配送单号:
-  distrBillId1: PSh0347202406030035
-  distrBillId2: PSh0347202406030035
-试剂配送单号:
-  distrBillId1: PSh0347202406030036
-  distrBillId2: PSh0347202406030036
+  distrBillId1: PSh0347202406030053
+  distrBillId2: PSh0347202406030053

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024060325174
-  orderNo2: PLAN2024060325174
+  orderNo1: PLAN2024060325203
+  orderNo2: PLAN2024060325203

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024060325172
-  orderNo2: PLAN2024060325172
+  orderNo1: PLAN2024060325204
+  orderNo2: PLAN2024060325204

data/b5_spd3_core_business_flow/message13

@@ -8,27 +8,27 @@
       taskType: 1
       sourceOrgId: p1e267
       sourceOrgName: 国药集团公司mvYxk
-      sourceOrderNo: PSh0347202406030033
-      billMode: '66'
+      sourceOrderNo: PSh0347202406030049
+      billMode: '16'
       stockKind:
       purMode:
-      sourceId: PSh0347202406030033
+      sourceId: PSh0347202406030049
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024060325169
-      purOrderNo: CG2024060317545
-      recOrgId: f8eb781292cd452eabd5ca99f8867aff
-      recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024060300021","planBillId":"Ph034720240603021814","planOrderNo":"PLAN2024060325169","buyOrderNo":"BUY2024060304540","purOrderNo":"CG2024060317545","purBillId":"Ch034720240603000109","purBillDate":"2024-06-03
-        11:11:57","distrBillId":"PSh0347202406030033","distrOrderNo":"PSh0347202406030033"}'
-      taskDate: '2024-06-03 11:12:14'
+      planOrderNo: PLAN2024060325187
+      purOrderNo: CG2024060317561
+      recOrgId: f6e2b5eb722b42e18bcc93ef29371337
+      recOrgName: 设备科001
+      billRelationJson: '{"planBillId":"Ph034720240603021832","planOrderNo":"PLAN2024060325187","purOrderNo":"CG2024060317561","purBillId":"Ch034720240603000125","purBillDate":"2024-06-03
+        13:49:55","distrBillId":"PSh0347202406030049","distrOrderNo":"PSh0347202406030049"}'
+      taskDate: '2024-06-03 13:50:14'
       taskDateStart:
       taskDateEnd:
       billModeList:
       viewIdList:
-      supplierFlag: true
+      supplierFlag: false
       tbStatus: 20
       remark: ''
   list_b:

data/b5_spd3_core_business_flow/message14

 验收单详情信息:
   list_a:
   - &id001
-    - purMode: 60
+    - purMode: 10
       unitName: 100支/100
-      hosGoodsId: h034700003965
+      hosGoodsId: h034700003964
       mdmGoodsCode:
-      spdGoodsCode: '11660903'
-      goodsCode: '00003965'
-      goodsName: 新型冠状病毒检测试剂9jSFk
+      spdGoodsCode: '11660902'
+      goodsCode: '00003964'
+      goodsName: 一次性注射器_低值qjUa2
       goodsGg: G-31891
       mfrsId:
       mfrsName: 德国歌德公司 Geuder AG
@@ -21,22 +21,22 @@
       pkgDefId:
       pkgDefName: '100'
       pkgDefQty: 100.0
-      batchCode: '4444'
+      batchCode: '333'
       expdtDate: '2024-12-10'
       productDate: '2024-06-03'
       provName: 国药集团公司mvYxk
       provId:
-      viewId: '03837956'
+      viewId: '03837972'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03837956'
+      id: '03837972'
       detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00003965","purMode":60,"goodsName":"新型冠状病毒检测试剂9jSFk","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660903","ybDefId":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00003964","purMode":10,"goodsName":"一次性注射器_低值qjUa2","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660902","ybDefId":""}'
       recTemperature: 20
       recHumidity: 30
       distrPrice: 99.9999
-      distrPkgQty: 1.0
-      distrQty: 100.0
+      distrPkgQty: 100.0
+      distrQty: 10000.0
       price: 99.9999
       checkQty: 0.0
       checkPkgQty: 0
@@ -55,7 +55,7 @@
       trustMrfsName:
       multiChargeFlag: 0
       useFrequency: 1
-      codingType: 0
+      codingType:
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024060300023
-  CHECK_NO2: CHECKh03472024060300023
+  CHECK_NO1: CHECKh03472024060300039
+  CHECK_NO2: CHECKh03472024060300039

data/b5_spd3_core_business_flow/message18

 条码信息:
   list_a:
   - &id001
-    id: '8800000001060547'
-    snCode: '8800000001060547'
-    ssccCode: '010839000182497226'
-    pkgCodeSee: '0100000000003963102221124060317241210218800000001060547'
-    hosGoodsId: h034700003963
-    hosGoodsCode: '00003963'
-    goodsCode: '00003963'
-    goodsName: 高值牙钻机^A%aM
+    id: UT240603001412
+    snCode: UT240603001412
+    ssccCode: '010839000182590422'
+    pkgCodeSee: 0136490000039650104444112406031724121021UT240603001412
+    hosGoodsId: h034700003965
+    hosGoodsCode: '00003965'
+    goodsCode: '00003965'
+    goodsName: 新型冠状病毒检测试剂9jSFk
     goodsSpec: G-31891
     goodsMfrsName: 德国歌德公司 Geuder AG
     unit: 支
-    purMode: 20
-    batchCode: '222'
+    purMode: 60
+    batchCode: '4444'
     productDate: '2024-06-03'
     expdtDate: '2024-12-10'
-    pkgDefName:
-    pkgDefQty: 1.0
+    pkgDefName: '100'
+    pkgDefQty: 100.0
     stockId: 6b6ca005ff174cf28bdfb475f7e57aad
     stockName: 二级检验科002库房
     areaName: 默认库区
     areaCode: areah03472179
     lockStatus: 0
-    unitName: 1支
+    unitName: 100支/100
     shelfCode: areah03472179-A-01-01
     shelfNo: A01-A-01-01
-    pkgDefId:
-    extInfo: '{"pkgDefQty": 1, "purBillId": "CG2024060317506", "distrBillId": "PSh0347202406030016",
-      "inStockTime": "2024-06-03 07:34:14", "useFrequency": 1, "distrDetailId": "03837935",
-      "certificateCode": "", "multiChargeFlag": 0}'
+    pkgDefId: 568e14ff69ff4d9a9489b94a09190c34
+    extInfo: '{"pkgDefId": "568e14ff69ff4d9a9489b94a09190c34", "pkgDefQty": 100, "purBillId":
+      "CG2024060317556", "pkgDefName": "100", "distrBillId": "PSh0347202406030045",
+      "inStockTime": "2024-06-03 13:02:39", "distrDetailId": "03837968", "certificateCode":
+      ""}'
     bottleId:
-    pkgType: '20'
+    pkgType: '66'
     miDjmc: ''
     miCode: ''
     transferRatio: 1.0
@@ -40,13 +41,13 @@
     shelfKindName: 普通货位
     provName: 国药集团公司mvYxk
     provId: p1e267
-    inStockDate: '2024-06-03 07:34:13'
+    inStockDate: '2024-06-03 13:02:39'
     mfrCode:
     made: 德国
     price:
-    barName: 1支
-    purModeText: 高值耗材
-    codeType: 20
+    barName: 100支/100
+    purModeText: 检验试剂
+    codeType: 66
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message21

@@ -16,7 +16,7 @@
       pkgDefName: '100'
       pkgDefQty: 100.0
       pkgQty:
-      qty: 200.0
+      qty: 100.0
       goodsImg: []
       pkgDefId: 568e14ff69ff4d9a9489b94a09190c34
       buyPkgQty:

data/b5_spd3_core_business_flow/message22

 库区信息:
   list_a:
   - &id001
-    - id: 96bcc652cdba4464948a0dd9c99640ae
-      lastModified: '2024-06-03 07:26:19'
-      version: 1
-      createTime: '2024-06-03 07:04:40'
+    - id: c944528a3ec248a8ae33e23ccc117c82
+      lastModified: '2024-06-03 13:09:21'
+      version: 7
+      createTime: '2024-06-03 10:22:51'
       createUser: h0347_UID-051310
       lastModifiedUser: h0347_UID-051310
-      stockId: 6b6ca005ff174cf28bdfb475f7e57aad
-      shelfCode: areah03472179
+      stockId: 16bf1408984440fa92786a65ff0068e5
+      shelfCode: areah03472182
       shelfName: 默认库区
-      address: 二级检验科002
+      address: 二级科室005
       shelfType:
       stockType: 0
       defaultFlag: 1
@@ -24,7 +24,7 @@
       shelfNo: A01
       shelfKind: 0
       hosId:
-      deptId: f8eb781292cd452eabd5ca99f8867aff
+      deptId: 9252920c3ff247fbbe034564fc6e9270
       areaCode:
       areaName:
       stockName:

data/b5_spd3_core_business_flow/message7

 采购计划单号:
-  orderNo1: PLAN2024060325173
-  orderNo2: PLAN2024060325173
+  orderNo1: PLAN2024060325202
+  orderNo2: PLAN2024060325202

data/b5_spd3_core_business_flow/message8

 配送订单信息:
   list_a:
   - &id001
-    - id: Ch034720240603000112
-      lastModified: '2024-06-03 11:23:33'
+    - id: Ch034720240603000138
+      lastModified: '2024-06-03 13:53:40'
       version: 0
-      createTime: '2024-06-03 11:23:33'
+      createTime: '2024-06-03 13:53:40'
       createUser: h0347_UID-051310
       lastModifiedUser:
-      orderNo: CG2024060317548
-      billMode: '66'
-      recType: HDI
+      orderNo: CG2024060317574
+      billMode: '20'
+      recType: YND
       hosId: h0347
       branchId: h0347-3649
       deptId:
       deptName:
-      recOrgId: f8eb781292cd452eabd5ca99f8867aff
-      recOrgName: 二级检验科002
+      recOrgId: f6e2b5eb722b42e18bcc93ef29371337
+      recOrgName: 设备科001
       areaCode:
       areaName:
       billExpdtDate:
-      sourceId: Ph034720240603021817
+      sourceId: Ph034720240603021845
       sourceType:
       inSettlement:
       recUser:
       recPhone:
-      recAddr: 二级检验科002
+      recAddr: 自动化测试
       provId: p1e267
       provName: 国药集团公司mvYxk
       subSendFlag:
@@ -45,9 +45,9 @@
       hosName: 邹城市人民医院(test)
       branchName: 东土城路院区kBIb2
       sumQty: 100.0
-      sumPkgQty: 1.0
+      sumPkgQty: 100.0
       sumAmount: '9999.9900'
-      planOrderNo: PLAN2024060325172
+      planOrderNo: PLAN2024060325200
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message9

 配送订单详细信息:
   list_a:
   - &id001
-    - id: 1bb8ed62d84244aa9ebb24a1efefde2c
+    - id: 190b3077df7d42e39f8a73ed570d75d4
       lastModified:
       version:
       createTime:
       createUser:
       lastModifiedUser:
-      pid: Ch034720240603000112
-      orderNo: CG2024060317548
-      sourceId: 904b5a12b36c49838e8b512af793df4f
-      hosGoodsId: h034700003965
-      mdmGoodsCode: '11660903'
-      goodsCode: '00003965'
-      purMode: 60
+      pid: Ch034720240603000138
+      orderNo: CG2024060317574
+      sourceId: b5e60aeef00f43d9b8028e003508d4c5
+      hosGoodsId: h034700003963
+      mdmGoodsCode: '11660901'
+      goodsCode: '00003963'
+      purMode: 20
       price: '99.9999'
-      supplyId: 5e4246f30eb645d9bb91bf40ba1963ae
-      pkgDefId: 568e14ff69ff4d9a9489b94a09190c34
-      pkgDefName: '100'
-      pkgDefQty: 100.0
-      pkgQty: 1.0
+      supplyId: e5035c1edcd1408e985defc9aa1d7cb5
+      pkgDefId:
+      pkgDefName:
+      pkgDefQty: 1.0
+      pkgQty: 100.0
       qty: 100.0
-      conPkgQty: 1.0
+      conPkgQty: 100.0
       conQty: 100.0
       checkPkgQty: 0.0
       checkQty: 0.0
@@ -31,18 +31,18 @@
       notSendPkgQty: 0.0
       inSettlement: 1
       closeType: 1
-      detailRelationJson: '{"planBillId":"Ph034720240603021817","buyDetailId":"Bh034720240603000270001","planDetailId":"904b5a12b36c49838e8b512af793df4f"}'
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00003965","purMode":60,"goodsName":"新型冠状病毒检测试剂9jSFk"}'
+      detailRelationJson: '{"planBillId":"Ph034720240603021845","planDetailId":"b5e60aeef00f43d9b8028e003508d4c5"}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00003963","purMode":20,"goodsName":"高值牙钻机^A%aM"}'
       remark:
       tbStatus:
       hosVersion:
       unit: 支
-      goodsName: 新型冠状病毒检测试剂9jSFk
+      goodsName: 高值牙钻机^A%aM
       mfrsId: mfrs-11229
       mfrsName: 德国歌德公司 Geuder AG
       goodsGg: G-31891
-      mdmGoodsSpecCode: '11660903'
-      erpCode: '11660903'
+      mdmGoodsSpecCode: '11660901'
+      erpCode: '11660901'
       made: 德国
       goodsDi:
       miDjmc:
@@ -65,17 +65,17 @@
       goodsRegCert: ''
       transCond: ''
       storageCond: ''
-      diType: gs1
-      diUse: '36490000039650'
+      diType:
+      diUse: '00000000003963'
       multiChargeFlag: 0
       useFrequency: 1
       chargeUnit:
       amount: '9999.9900'
-      unitName: 100支/100
+      unitName: 1支
       subProvId: p1e267
       subProvName: 国药集团公司mvYxk
       subPrice: 99.9999
-      replPkgQty: 1.0
+      replPkgQty: 100.0
       replQty: 100.0
       ybDefId:
       logicId:

report/summary.html

@@ -77,7 +77,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>1分38秒</td>
+            <td class='details-col-elapsed'>0分22秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a_b5流程十二请领业务流_二级库向二级库/log.html' target='_blank'>a_b5流程十二请领业务流_二级库向二级库</a></td>
+            <td class="details-col-elapsed"><a href='../log/a_a5流程五_中心库入库结算_正结算1_提交采购计划/log.html' target='_blank'>a_a5流程五_中心库入库结算_正结算1_提交采购计划</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">97.899</td>
+            <td class="details-col-elapsed">22.142</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>