脚本优化

air_case/b5_spd3_core_business_flow/a_c1流程十八中心库业务_拆包功能.air/a_c1流程十八中心库业务_拆包功能.py

@@ -90,7 +90,7 @@ def center_Stock_unpack(type):  # 扫码发放(高值不能扫码发放)
         UTid = 'UT'
         areaCode = 'areaCode'
         # createTime = 'createTime'
-        hosId = 'hosId'
+        # hosId = 'hosId'
         stockId = 'stockId'
         areaCode = 'areaCode'
         areaName = 'areaName'
@@ -256,7 +256,7 @@ def center_Stock_unpack(type):  # 扫码发放(高值不能扫码发放)
         UTid = 'UT'
         areaCode = 'areaCode'
         # createTime = 'createTime'
-        hosId = 'hosId'
+        # hosId = 'hosId'
         stockId = 'stockId'
         areaCode = 'areaCode'
         areaName = 'areaName'
@@ -363,7 +363,7 @@ def center_Stock_unpack(type):  # 扫码发放(高值不能扫码发放)
         print('request_body', 'ccccccc', request_body)
         # # # # 发送请求
         result = commonFuc().http_post(url, request_body, headers)
-        print('result', result)
+        print('拆包功能,result', result)
         code=commonFuc().analysis_json('code',result)
         if code==1010:
             commonFuc().check_text_exist_result_text('error', 'succees')

data/b5_spd3_core_business_flow/data

@@ -445,211 +445,8 @@ json_headers2: {
     "pickType": "TH"
 }
 "payload67": {"pickType":"CB","tbStatus":20,"code":"%s","stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","ignoreValidExpDate":false}
-"payload68": {"stockId": "%s","stockName": "%s","areaCode": "%s","areaName": "%s","barCodeList": [{"id": "%s","lastModified": null,"version": null,"createTime": "%s","createUser": null,"lastModifiedUser": null,"snCode": "%s","hosId": "%s","branchId": null,"stockId": "%s","areaCode": "%s","areaName": "%s", "shelfCode": "%s","codeType": "%s","tagType": 0,"hosGoodsId": "%s","mdmGoodsCode": "%s","goodsCode": "%s","goodsDi": "%s","barName": "%s","batchCode": "%s","expdtDate": "%s","productDate": "%s","mfrCode": null,"mfrCodeSee": null,"pkgCode": "%s","pkgCodeSee": "%s","ssccCode": "%s", "extInfo": null,"outId": null, "tbStatus": "%s","goodsCodeDi": null,"barcodeId": null,"ext": {"pkgDefId": "%s","pkgDefQty": "%s","purBillId": "%s","pkgDefName": "%s","distrBillId": "%s",          "inStockTime": "%s",
-"distrDetailId": "%s",
-"certificateCode": ""
-},
-"sourceDetailId": null,
-"purMode": "%s",
-"purModes": null,
-"price": "%s",
-"pid": null,
-"goodsMfrsName": "%s",
-"mfrsName": null,
-"goodsSpec": "%s",
-"unit": "%s",
-"goodsName": "%s",
-"pkgDefId": "%s",
-"pkgDefQty": "%s",
-"defaultPkgDefQty": null,
-"defaultQty": null,
-"defaultSurplusQty": null,
-"defaultPkgDefId": null,
-"purDetailId": null,
-"pkgDefName": "%s",
-"printNum": "%s",
-"deptId": null,
-"deptName": null,
-"billId": null,
-"taskId": null,
-"made": "%s",
-"provId": null,
-"provName": null,
-"subProvId": null,
-"subProvName": null,
-"provHosGoodsId": null,
-"sourceType": null,
-"taskDate": null,
-"sourceOrderNo": null,
-"taskType": null,
-"detailId": null,
-"branchGoodsPkgDefList": null,
-"unitName": "%s",
-"areaCodeList": null,
-"diType": null,
-"mdmGoodsSpecCode": null,
-"hosGoodsCode": "%s",
-"supplyId": null,
-"inSettlement": null,
-"spdGoodsCode": null,
-"codeKind": null,
-"brand": null,
-"miCode": "",
-"transferRatio": 1,
-"miDjmc": "",
-"tbStatusList": null,
-"purModeText": "%s",
-"stockName": null,
-"tbStatusText": null,
-"pkgType": null,
-"bottleId": null,
-"pkgStatus": null,
-"qty": 1,
-"packUnit": null,
-"minSaleQty": null,
-"rfidFlag": null,
-"mfrCodeFlag": null,
-"scanStatus": null,
-"scanId": null,
-"multiChargeFlag": null,
-"useFrequency": null,
-"chargeUnit": null,
-"lockStatus": null,
-"remark": null,
-"hosBatchId": null,
-"settleFlag": null,
-"inStockTime": null,
- "verifyFlag":null
-        }
-    ],
-    "pickType": "CB",
-    "tbStatus": "%s"
-}
-"payload69": {
-    "stockId": "%s",
-    "stockName": "%s",
-    "areaCode": "%s",
-    "areaName": "%s",
-    "barCodeList": [
-        {
-            "id": "%s",
-            "lastModified": null,
-            "version": null,
-            "createTime": "%s",
-            "createUser": null,
-            "lastModifiedUser": null,
-            "snCode": "%s",
-            "hosId": "%s",
-            "branchId": null,
-            "stockId": "%s",
-            "areaCode": "%s",
-            "areaName": "%s",
-            "shelfCode": "%s",
-            "codeType": "%s",
-            "tagType": 0,
-            "hosGoodsId": "%s",
-            "mdmGoodsCode": "%s",
-            "goodsCode": "%s",
-            "goodsDi": "%s",
-            "barName": "%s",
-            "batchCode": "%s",
-            "expdtDate": "%s",
-            "productDate": "%s",
-            "mfrCode": null,
-            "mfrCodeSee": null,
-            "pkgCode": "%s",
-            "pkgCodeSee": "%s",
-            "ssccCode": "%s",
-            "extInfo": null,
-            "outId": null,
-            "tbStatus": "%s",
-            "goodsCodeDi": null,
-            "barcodeId": null,
-            "ext": {
-                "pkgDefId": "%s",
-                "pkgDefQty": "%s",
-                "purBillId": "%s",
-                "pkgDefName": "%s",
-                "distrBillId": "%s",
-                "inStockTime": "%s",
-                "distrDetailId": "%s",
-                "certificateCode": ""
-            },
-            "sourceDetailId": null,
-            "purMode": "%s",
-            "purModes": null,
-            "price":"%s",
-            "pid": null,
-            "goodsMfrsName": "%s",
-            "mfrsName": null,
-            "goodsSpec": "%s",
-            "unit": "%s",
-            "goodsName": "%s",
-            "pkgDefId": "%s",
-            "pkgDefQty": "%s",
-            "defaultPkgDefQty": null,
-            "defaultQty": null,
-            "defaultSurplusQty": null,
-            "defaultPkgDefId": null,
-            "purDetailId": null,
-            "pkgDefName": "%s",
-            "printNum": "%s",
-            "deptId": null,
-            "deptName": null,
-            "billId": null,
-            "taskId": null,
-            "made": "%s",
-            "provId": null,
-            "provName": null,
-            "subProvId": null,
-            "subProvName": null,
-            "provHosGoodsId": null,
-            "sourceType": null,
-            "taskDate": null,
-            "sourceOrderNo": null,
-            "taskType": null,
-            "detailId": null,
-            "branchGoodsPkgDefList": null,
-            "unitName": "%s",
-            "areaCodeList": null,
-            "diType": null,
-            "mdmGoodsSpecCode": null,
-            "hosGoodsCode": "%s",
-            "supplyId": null,
-            "inSettlement": null,
-            "spdGoodsCode": null,
-            "codeKind": null,
-            "brand": null,
-            "miCode": "",
-            "transferRatio": 1,
-            "miDjmc": "",
-            "tbStatusList": null,
-            "purModeText": "%s",
-            "stockName": null,
-            "tbStatusText": null,
-            "pkgType": null,
-            "bottleId": null,
-            "pkgStatus": null,
-            "qty": 1,
-            "packUnit": null,
-            "minSaleQty": null,
-            "rfidFlag": null,
-            "mfrCodeFlag": null,
-            "scanStatus": null,
-            "scanId": null,
-            "multiChargeFlag": null,
-            "useFrequency": null,
-            "chargeUnit": null,
-            "lockStatus": null,
-            "remark": null,
-            "hosBatchId": null,
-            "settleFlag": null,
-            "inStockTime": null,
-            "verifyFlag":null
-        }
-    ],
-    "pickType": "CB",
-    "tbStatus": "%s"
-}
+"payload68": {"stockId": "%s","stockName": "%s","areaCode": "%s","areaName": "%s","barCodeList": [{"id": "%s","lastModified": null,"version": null,"createTime": "%s","createUser": null,"lastModifiedUser": null,"snCode": "%s","hosId": "%s","branchId": null,"stockId": "%s","areaCode": "%s","areaName": "%s","shelfCode": "%s","codeType": "%s","tagType": 0,"hosGoodsId": "%s","mdmGoodsCode": "%s","goodsCode": "%s","goodsDi": "%s","barName": "%s","batchCode": "%s","expdtDate": "%s","productDate": "%s","mfrCode": null,"mfrCodeSee": null,"pkgCode": "%s","pkgCodeSee": "%s","ssccCode": "%s", "extInfo": null,"outId": null, "tbStatus": "%s","goodsCodeDi": null,"barcodeId": null,"ext": {"pkgDefId": "%s","pkgDefQty": "%s","purBillId": "%s","pkgDefName": "%s","distrBillId": "%s","inStockTime": "%s","distrDetailId": "%s","certificateCode": ""},"sourceDetailId": null,"purMode": "%s","purModes": null,"price": "%s","pid": null,"goodsMfrsName": "%s","mfrsName": null,"goodsSpec": "%s","unit": "%s","goodsName": "%s","pkgDefId": "%s","pkgDefQty": "%s","defaultPkgDefQty": null,"defaultQty": null,"defaultSurplusQty": null,"defaultPkgDefId": null,"purDetailId": null,"pkgDefName": "%s","printNum": "%s","deptId": null,"deptName": null,"billId": null,"taskId": null,"made": "%s","provId": null,"provName": null,"subProvId": null,"subProvName": null,"provHosGoodsId": null,"sourceType": null,"taskDate": null,"sourceOrderNo": null,"taskType": null,"detailId": null,"branchGoodsPkgDefList": null,"unitName": "%s","areaCodeList": null,"diType": null,"mdmGoodsSpecCode": null,"hosGoodsCode": "%s","supplyId": null,"inSettlement": null,"spdGoodsCode": null,"codeKind": null,"brand": null,"miCode": "","transferRatio": 1,"miDjmc": "","tbStatusList": null,"purModeText": "%s","stockName": null,"tbStatusText": null,"pkgType": null,"bottleId": null,"pkgStatus": null,"qty": 1,"packUnit": null,"minSaleQty": null,"rfidFlag": null,"mfrCodeFlag": null,"scanStatus": null,"scanId": null,"multiChargeFlag": null,"useFrequency": null,"chargeUnit": null,"lockStatus": null,"remark": null,"hosBatchId": null,"settleFlag": null,"inStockTime": null,"verifyFlag": null}],"pickType": "CB","tbStatus": "%s"}
+"payload69": {"stockId": "%s","stockName": "%s","areaCode": "%s","areaName": "%s","barCodeList": [{"id": "%s","lastModified": null,"version": null,"createTime": "%s","createUser": null,"lastModifiedUser": null,"snCode": "%s","hosId": "%s","branchId": null,"stockId": "%s","areaCode": "%s","areaName": "%s","shelfCode": "%s","codeType": "%s","tagType": 0,"hosGoodsId": "%s","mdmGoodsCode": "%s","goodsCode": "%s","goodsDi": "%s","barName": "%s","batchCode": "%s","expdtDate": "%s","productDate": "%s","mfrCode": null,"mfrCodeSee": null,"pkgCode": "%s","pkgCodeSee": "%s","ssccCode": "%s","extInfo": null,"outId": null,"tbStatus": "%s","goodsCodeDi": null,"barcodeId": null,"ext": {"pkgDefId": "%s","pkgDefQty": "%s","purBillId": "%s","pkgDefName": "%s","distrBillId": "%s","inStockTime": "%s","distrDetailId": "%s","certificateCode": ""},"sourceDetailId": null,"purMode": "%s","purModes": null,"price":"%s","pid": null,"goodsMfrsName": "%s","mfrsName": null,"goodsSpec": "%s","unit": "%s","goodsName": "%s","pkgDefId": "%s","pkgDefQty": "%s","defaultPkgDefQty": null,"defaultQty": null,"defaultSurplusQty": null,"defaultPkgDefId": null,"purDetailId": null,"pkgDefName": "%s","printNum": "%s","deptId": null,"deptName": null,"billId": null,"taskId": null,"made": "%s","provId": null,"provName": null,"subProvId": null,"subProvName": null,"provHosGoodsId": null,"sourceType": null,"taskDate": null,"sourceOrderNo": null,"taskType": null,"detailId": null,"branchGoodsPkgDefList": null,"unitName": "%s","areaCodeList": null,"diType": null,"mdmGoodsSpecCode": null,"hosGoodsCode": "%s","supplyId": null,"inSettlement": null,"spdGoodsCode": null,"codeKind": null,"brand": null,"miCode": "","transferRatio": 1,"miDjmc": "","tbStatusList": null,"purModeText": "%s","stockName": null,"tbStatusText": null,"pkgType": null,"bottleId": null,"pkgStatus": null,"qty": 1,"packUnit": null,"minSaleQty": null,"rfidFlag": null,"mfrCodeFlag": null,"scanStatus": null,"scanId": null,"multiChargeFlag": null,"useFrequency": null,"chargeUnit": null,"lockStatus": null,"remark": null,"hosBatchId": null,"settleFlag": null,"inStockTime": null,"verifyFlag":null}],"pickType": "CB","tbStatus": "%s"}
+
 "expected_value": "('00004260', 'h0347', 'p1e2ca', '177df1fadf39415ea5ce40e64edf449d', None, '11661208', '11661208', '11661208', '一次性注射器_低值hMY2F','一次性注射器', 'mfrs-11229', '德国歌德公司 Geuder AG', '', None, '', 'ycxzsq_dzhMY2F', None, '支', 'G-31891', Decimal('1.000000'), 2, '3', 10, None, None, '', None, Decimal('99.9999'), None, '德国', None, None, '', 1, None, 0, None, 0, '', '', None, None, 1, 0, 1, 'p1e2ca:UID-051951', datetime.datetime(2024, 6, 26, 7, 1, 39), 'p1e2ca:UID-051951', 0, 0, 1, None)"
 "expected_value2": '{"hos_goods_code": "00004249","hos_id": "h0347","prov_id": "p1e2c6","prov_hos_goods_id": "%s","srv_id": null,"mdm_goods_code": "11661197","mdm_goods_spec_code": "11661197","spd_goods_code": "11661197","goods_name": "一次性注射器_低值qPW6a","goods_general_name": "一次性注射器","goods_mfrs_id": "mfrs-11229","goods_mfrs_name": "德国歌德公司 Geuder AG","goods_reg_cert": "","goods_agent_mfrs_id": null,"brand": "","short_pinyin": "ycxzsq_dzqPW6a","kind_sixtyeight_code": null,"unit": "支","goods_spec": "G-31891","goods_package": Decimal("1.000000"),"bar_code_mng": 2,"unique_code_strategy": "3","pur_mode": 10,"sub_pur_mode": null,"erp_code": null,"herp_code": "","hrp": null,"price": Decimal("99.9999"),"abroad_flag": null,"made": "德国","property": null,"mgr_level": null,"goods_desc": "","charge_flag": 1,"focus_control_type": null,"temp_flag": 0,"official_status": null,"focus_control": 0,"storage_conditions": "","transport_conditions": "","into_cost_flag": null,"rfid_flag": null,"purchase_flag": 1,"tb_status": 0,"version": 1,"create_user": "p1e2c6:UID-051946","create_time": datetime.datetime(2024,6,25,7,1,34),"last_modified_user": "p1e2c6:UID-051946","sterilize_flag": 0,"multi_charge_flag": 0,"use_frequency": 1,"charge_unit": null}'

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202407080002
-  distrBillId2: PSh0347202407080002
+  distrBillId1: PSh0347202407080035
+  distrBillId2: PSh0347202407080035
 高值配送单号:
-  distrBillId1: PSh0347202407080003
-  distrBillId2: PSh0347202407080003
+  distrBillId1: PSh0347202407080036
+  distrBillId2: PSh0347202407080036
 试剂配送单号:
-  distrBillId1: PSh0347202407080004
-  distrBillId2: PSh0347202407080004
-高值跟台配送单号:
-  distrBillId1: PSh0347202407080005
-  distrBillId2: PSh0347202407080005
+  distrBillId1: PSh0347202407080037
+  distrBillId2: PSh0347202407080037

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024070831697
-  orderNo2: PLAN2024070831697
+  orderNo1: PLAN2024070831738
+  orderNo2: PLAN2024070831738

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024070831696
-  orderNo2: PLAN2024070831696
+  orderNo1: PLAN2024070831737
+  orderNo2: PLAN2024070831737

data/b5_spd3_core_business_flow/message13

@@ -8,28 +8,29 @@
       taskType: 1
       sourceOrgId: p1e32e
       sourceOrgName: 国药集团公司^n1@F
-      sourceOrderNo: PSh0347202407080005
-      billMode: '25'
+      sourceOrderNo: PSh0347202407080037
+      billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202407080005
+      sourceId: PSh0347202407080037
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: SSSQ202407080331
-      purOrderNo: SSTZ202407080307
+      planOrderNo: PLAN2024070831737
+      purOrderNo: CG2024070820812
       recOrgId: b3e6c5f2887148389f8535862f789f0a
       recOrgName: 二级检验科002
-      billRelationJson: '{"operationApplyOrderNo":"SSSQ202407080331","operationNoticeBillId":"Nh034720240708000001","distrBillId":"PSh0347202407080005","operationNoticeOrderNo":"SSTZ202407080307","distrOrderNo":"PSh0347202407080005","operationApplyBillId":"Oh034720240708000001"}'
-      taskDate: '2024-07-08 05:14:18'
+      billRelationJson: '{"buyBillId":"Bh03472024070800072","planBillId":"Ph034720240708028382","planOrderNo":"PLAN2024070831737","buyOrderNo":"BUY2024070806023","purOrderNo":"CG2024070820812","purBillId":"Ch034720240708000075","purBillDate":"2024-07-08
+        10:50:17","distrBillId":"PSh0347202407080037","distrOrderNo":"PSh0347202407080037"}'
+      taskDate: '2024-07-08 10:51:04'
       taskDateStart:
       taskDateEnd:
       billModeList:
       viewIdList:
-      supplierFlag: false
+      supplierFlag: true
       tbStatus: 20
-      remark:
+      remark: ''
       pdaFlag:
   list_b:
   - *id001

data/b5_spd3_core_business_flow/message14

 验收单详情信息:
   list_a:
   - &id001
-    - purMode: 20
-      unitName: 1支
-      hosGoodsId: h034700004499
+    - purMode: 60
+      unitName: 100支/100
+      hosGoodsId: h034700004501
       mdmGoodsCode:
-      spdGoodsCode: '11661452'
-      goodsCode: '00004499'
-      goodsName: 高值牙钻机PFKHm
+      spdGoodsCode: '11661454'
+      goodsCode: '00004501'
+      goodsName: 新型冠状病毒检测试剂hO3Tu
       goodsGg: G-31891
       mfrsId:
       mfrsName: 德国歌德公司 Geuder AG
@@ -16,27 +16,27 @@
       goodsDi: '01123456789012'
       miCode:
       miDjmc:
-      certificateCode:
+      certificateCode: ''
       rfidFlag: 0
       pkgDefId:
-      pkgDefName:
-      pkgDefQty: 1.0
-      batchCode: '2222'
+      pkgDefName: '100'
+      pkgDefQty: 100.0
+      batchCode: '4444'
       expdtDate: '2025-01-14'
       productDate: '2024-07-08'
       provName: 国药集团公司^n1@F
       provId:
-      viewId: '03839346'
+      viewId: '03839378'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03839346'
+      id: '03839378'
       detailRelationJson:
-      extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004501","purMode":60,"goodsName":"新型冠状病毒检测试剂hO3Tu","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661454","ybDefId":""}'
       recTemperature: 20
       recHumidity: 30
       distrPrice: 99.9999
       distrPkgQty: 1.0
-      distrQty: 1.0
+      distrQty: 100.0
       price: 99.9999
       checkQty: 0.0
       checkPkgQty: 0
@@ -44,7 +44,7 @@
       initQty:
       totalQty:
       rowNum:
-      settlement: 3
+      settlement: 1
       hdiBarcodeList:
       detailId:
       pkgCode:

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024070800005
-  CHECK_NO2: CHECKh03472024070800005
+  CHECK_NO1: CHECKh03472024070800034
+  CHECK_NO2: CHECKh03472024070800034

data/b5_spd3_core_business_flow/message16

@@ -7,13 +7,13 @@
       createTime:
       createUser: h0347_UID-051402
       lastModifiedUser:
-      billMode: '16'
+      billMode: '66'
       recType:
       stockKind:
       purMode:
-      sourceId: CHECKh03472024070800002
-      sourceType: PSD
-      sourceVersion: 0
+      sourceId: DRh034720240708000067
+      sourceType: CK_TK
+      sourceVersion: 1
       batchList:
       billRelationJson:
       hosId: h0347
@@ -21,18 +21,18 @@
       deptName:
       branchId: h0347-3736
       branchName:
-      taskType: 1
-      sourceOrgId: p1e32e
-      sourceOrgName: 国药集团公司^n1@F
-      sourceOrderNo: YS240708002
-      taskSourceNo: PSh0347202407080002
-      areaCode: areah03472677
-      areaName: 自动化测试
+      taskType: 2
+      sourceOrgId: b3e6c5f2887148389f8535862f789f0a
+      sourceOrgName: 二级检验科002
+      sourceOrderNo: DN20240708000067
+      taskSourceNo: DN20240708000067
+      areaCode:
+      areaName:
       goodsName:
       goodsGg:
       startDate:
       endDate:
-      taskDate: '2024-07-08 05:07:01'
+      taskDate: '2024-07-08 11:09:20'
       pkgTaskId:
       pkgFlag:
       remark: ''

data/b5_spd3_core_business_flow/message17

 验收单库存详情信息:
   list_a:
   - &id001
-    - id: CHECKh034720240708000020001
+    - id: DRh0347202407080000670001
       lastModified:
       version:
       createTime:
       createUser:
       lastModifiedUser:
       rowIdx:
-      purMode: 10
+      purMode: 60
       unitName: 100支/100
-      pid: CHECKh03472024070800002
-      hosGoodsId: h034700004500
-      batchCode: '333'
+      pid: DRh034720240708000067
+      hosGoodsId: h034700004501
+      batchCode: '4444'
       expdtDate: '2025-01-14'
       productDate: '2024-07-08'
       batchPrice: 99.9999
       settlement: 1
-      batchType: 20
-      srcBatchId: '03839343'
+      batchType: 40
+      srcBatchId: Ph034724070800029
       srcBatchPrice: 99.9999
       shelfCode: areah03472677-2-01-01
       shelfKind:
-      barcodeId: UT240708000001
+      barcodeId: UT240708000214
       subBarcodeId:
-      qty: 10000.0
-      pkgQty: 100
-      distrId: PSh0347202407080002
-      distrDetailId: '03839343'
-      pkgDefQty: 100.0
-      pkgDefName: '100'
-      viewId: h0347000045003332025-01-14100支/100
+      qty: 100.0
+      pkgQty: 1
+      distrId: PSh0347202407080028
+      distrDetailId: '03839369'
+      pkgDefQty:
+      pkgDefName:
+      viewId: h03470000450144442025-01-14100支/100
       codingType:
       batchFlag:
       hasSterilize: 0
@@ -38,53 +38,60 @@
       sterilizePassQty:
       sterilizeRejectQty:
       orderNo:
-      sourceDetailId: '03839343'
-      mdmGoodsCode: '11661453'
-      goodsCode: '00004500'
-      tbStatus: 1
-      billMode: '16'
-      hosId: h0347
-      branchId: h0347-3736
-      purBillId: Ch034720240708000031
+      sourceDetailId: PICKh03472407080047660001
+      mdmGoodsCode: '11661454'
+      goodsCode: '00004501'
+      tbStatus:
+      billMode:
+      hosId:
+      branchId:
+      purBillId: Ch034720240708000066
       provId: p1e32e
-      provName: 国药集团公司^n1@F
-      subSendFlag: 10
-      exeProvId: p1e32e
-      exeProvName: 国药集团公司^n1@F
-      purDetailId: ce7f4604ecc3425fa637428e165eed27
-      goodsName: 一次性注射器_低值wExpg
+      provName:
+      subProvId: p1e32e
+      purDetailId:
+      goodsName: 新型冠状病毒检测试剂hO3Tu
       goodsGg: G-31891
       mfrsId: mfrs-11229
       mfrsName: 德国歌德公司 Geuder AG
       made: 德国
       unit: 支
-      purPrice: 99.9999
-      pkgDefId: 34b26233759a4720920cc8328dd1f8d1
-      supplyId: 7be89fe4c5ee4689a5e249d3197b9947
-      subProvId: p1e32e
-      subProvName: 国药集团公司^n1@F
-      subPrice: 99.9999
-      distrPrice: 99.9999
-      distrPkgQty: 100.0
-      distrQty: 10000.0
+      sourceBatchId: Ph034724070800029
+      targetBatchId: Ph034724070800029
+      pkgDefId:
       certificateCode: ''
       productCertCode:
-      detailRelationJson:
       extInfo:
       psiPrice: 99.9999
       ext:
         goodsGg: G-31891
-        goodsCode: '00004500'
-        purMode: 10
-        goodsName: 一次性注射器_低值wExpg
+        goodsCode: '00004501'
+        purMode: 60
+        goodsName: 新型冠状病毒检测试剂hO3Tu
         ygptCode: ''
         transCond: ''
         storageCond: ''
-        erpCode: '11661453'
+        erpCode: '11661454'
         ybDefId: ''
-      purTaskId:
-      multiChargeFlag:
+        contractId: ''
+        normalContractId: ''
+        fcatId: ''
+        fcatName: ''
+        goodsKindId: ''
+        goodsKindName: ''
+        miTwentysevenCode: ''
+        focus_control: '0'
+        focus_control_type:
+      rtnQty:
+      hisChargeNo:
       trustMrfsName:
+      pkgCodeSee:
+      chargeFlag:
+      stockKind: CK_TK
+      sourceDeptId: b3e6c5f2887148389f8535862f789f0a
+      targetDeptId: a762aa0aa2df47dbac4a96173a89e85d
+      ableDelFlag:
+      pickType: KS_TK
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message18

 条码信息:
   list_a:
   - &id001
-    id: UT240708000102
-    snCode: UT240708000102
-    ssccCode: '010839000187194724'
-    pkgCodeSee: 0101123456789012104444112407081725011421UT240708000102
+    id: UT240708000105
+    snCode: UT240708000105
+    ssccCode: '010839000187195028'
+    pkgCodeSee: 0101123456789012104444112407081725011421UT240708000105
     hosGoodsId: h034700004501
     hosGoodsCode: '00004501'
     goodsCode: '00004501'

data/b5_spd3_core_business_flow/message21

@@ -16,7 +16,7 @@
       pkgDefName: '100'
       pkgDefQty: 100.0
       pkgQty:
-      qty: 100.0
+      qty: 600.0
       goodsImg: []
       pkgDefId: 2d4d3bd0ebe745efa73bb7123cf21f6a
       buyPkgQty:
@@ -40,8 +40,8 @@
       purModeText: 检验试剂
       goodsGeneralName: 检测试剂
       provName: 国药集团公司^n1@F
-      noRecPkgQty: 11.0
-      noRecQty: 1100.0
+      noRecPkgQty: 15.0
+      noRecQty: 1500.0
       autoUnpack: 0
       consumeQty:
       consumePkgQty:

data/b5_spd3_core_business_flow/message7

 采购计划单号:
-  orderNo1: PLAN2024070831695
-  orderNo2: PLAN2024070831695
+  orderNo1: PLAN2024070831736
+  orderNo2: PLAN2024070831736

data/b5_spd3_core_business_flow/message8

 配送订单信息:
   list_a:
   - &id001
-    - id: Nh034720240708000001
-      orderNo: SSTZ202407080307
-      sourceOrderNo: SSSQ202407080331
-      hosId: h0347
-      hosName: 邹城市人民医院(test)
-      branchName: 东土城路院区IjnkG
-      recDeptName: 二级检验科002
-      operName: 血管扩张术
-      operDate: '2024-07-09'
-      operDoctor: 李*
-      patientName: 张*
-      status: 10
-      statusText: 待确认
+    - id: Ch034720240708000075
+      lastModified: '2024-07-08 10:50:17'
       version: 0
-      patientInHosId: '123456'
-      surDeptName: ''
-      remark: 自动化测试
-      createUserName: 自动化测试xgQKu
-      distPriority: 0
-      distPriorityText:
-      distId:
-      distNo:
-      hosVersion: 3
-      createTime: '2024-07-08 05:13:53'
-      sumQty:
-      sumAmount:
-      operationPkg: 0
+      createTime: '2024-07-08 10:50:17'
+      createUser: h0347_UID-051402
+      lastModifiedUser:
+      orderNo: CG2024070820812
+      billMode: '66'
+      recType: HDI
+      hosId: h0347
+      branchId: h0347-3736
+      deptId:
+      deptName:
+      recOrgId: b3e6c5f2887148389f8535862f789f0a
+      recOrgName: 二级检验科002
+      areaCode:
+      areaName:
+      billExpdtDate:
+      sourceId: Ph034720240708028382
+      sourceType:
+      inSettlement:
+      recUser:
+      recPhone:
+      recAddr: 自动化测试
       provId: p1e32e
       provName: 国药集团公司^n1@F
-      subProvId: ''
-      subProvName: ''
-      recDeptId: b3e6c5f2887148389f8535862f789f0a
+      subSendFlag:
+      exeProvId: p1e32e
+      exeProvName: 国药集团公司^n1@F
+      billRelationJson:
+      extInfo:
+      barcodeFlag: 1
+      pkgFlag:
+      remark: ''
+      priority:
+      closeStatus: 0
+      closeDate:
+      upStatus:
+      tbStatus: 30
+      hosVersion: 3
+      billType: CGD
+      hosName: 邹城市人民医院(test)
+      branchName: 东土城路院区IjnkG
+      sumQty: 100.0
+      sumPkgQty: 1.0
+      sumAmount: '9999.9900'
+      planOrderNo: PLAN2024070831737
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message9

 配送订单详细信息:
   list_a:
   - &id001
-    id: Nh034720240708000001
-    orderNo: SSTZ202407080307
-    sourceOrderNo: SSSQ202407080331
-    hosId: h0347
-    hosName: 邹城市人民医院(test)
-    branchName: 东土城路院区IjnkG
-    recDeptName: 二级检验科002
-    operName: 血管扩张术
-    operDate: '2024-07-09'
-    operDoctor: 李*
-    patientName: 张*
-    status: 20
-    statusText: 待配送
-    version: 1
-    patientInHosId: '123456'
-    surDeptName: ''
-    remark: 自动化测试
-    createUserName: 自动化测试xgQKu
-    distPriority: 0
-    distPriorityText: 否
-    distId:
-    distNo:
-    hosVersion: 3
-    createTime: '2024-07-08 05:13:53'
-    sumQty: 1
-    sumAmount: '99.9999'
-    operationPkg: 0
-    provId: p1e32e
-    provName: 国药集团公司^n1@F
-    subProvId: ''
-    subProvName: ''
-    recDeptId: b3e6c5f2887148389f8535862f789f0a
-  list_b:
-  - *id001
-  list_c:
-  - *id001
-配送订单详细信息2:
-  list_a:
-  - &id001
-    - id: h034720240708000001
-      hosGoodsId: h034700004499
-      goodsNum: 1
+    - id: a1c8444539c0494eaaf5e4ff47f01ede
+      lastModified:
+      version:
+      createTime:
+      createUser:
+      lastModifiedUser:
+      pid: Ch034720240708000075
+      orderNo: CG2024070820812
+      sourceId: 5e2c5fafc7194a1595f58086c8439a1b
+      hosGoodsId: h034700004501
+      mdmGoodsCode: '11661454'
+      goodsCode: '00004501'
+      purMode: 60
       price: '99.9999'
-      inSettlement: 3
-      inSettlementText: 消耗结算
-      goodsName: 高值牙钻机PFKHm
-      goodsSpec: G-31891
-      goodsCode: '00004499'
-      goodsMfrsId: mfrs-11229
-      goodsMfrsName: 德国歌德公司 Geuder AG
+      supplyId: 61f4b62efd344a318049d035e4e3bf41
+      pkgDefId: 2d4d3bd0ebe745efa73bb7123cf21f6a
+      pkgDefName: '100'
+      pkgDefQty: 100.0
+      pkgQty: 1.0
+      qty: 100.0
+      conPkgQty: 1.0
+      conQty: 100.0
+      checkPkgQty: 0.0
+      checkQty: 0.0
+      distrPkgQty: 0.0
+      distrQty: 0.0
+      notSendQty: 0.0
+      notSendPkgQty: 0.0
+      inSettlement: 1
+      closeType: 1
+      detailRelationJson: '{"planBillId":"Ph034720240708028382","buyDetailId":"Bh034720240708000720001","planDetailId":"5e2c5fafc7194a1595f58086c8439a1b"}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004501","purMode":60,"goodsName":"新型冠状病毒检测试剂hO3Tu"}'
+      remark:
+      tbStatus:
+      hosVersion:
       unit: 支
-      subProvId: p1e32e
-      subProvName: 国药集团公司^n1@F
-      totalAmount: '99.9999'
-      spdGoodsCode: '11661452'
-      barCodeMng: 2
-      erpCode: '11661452'
+      goodsName: 新型冠状病毒检测试剂hO3Tu
+      mfrsId: mfrs-11229
+      mfrsName: 德国歌德公司 Geuder AG
+      goodsGg: G-31891
+      mdmGoodsSpecCode: '11661454'
+      erpCode: '11661454'
+      made: 德国
+      goodsDi: '01123456789012'
+      miDjmc:
+      miGoodsGg:
+      miGoodsXh:
+      miCode:
+      miTwentyCode:
+      miTwentysevenCode: ''
+      miKindCode:
+      purchaseContent:
+      purchaseUnit:
+      buyContent:
+      buyUnit:
+      transferRatio:
+      extend:
+      hitCode: '12'
+      hitPrice: 99.9999
+      barCodeMng: '2'
+      rfidFlag:
+      goodsRegCert: ''
+      transCond: ''
+      storageCond: ''
+      diType:
+      diUse: '01123456789012'
       multiChargeFlag: 0
       useFrequency: 1
       chargeUnit:
-      hitCode: '12'
-      hitPrice: '99.999900'
-      diUse:
-      goodsDi: '01123456789012'
+      amount: '9999.9900'
+      unitName: 100支/100
+      subProvId: p1e32e
+      subProvName: 国药集团公司^n1@F
+      subPrice: 99.9999
+      replPkgQty: 1.0
+      replQty: 100.0
+      ybDefId:
+      logicId:
+      provGoodsId:
+      sendFlag:
+      curQry:
   list_b:
   - *id001
   list_c:

report/summary.html

@@ -75,9 +75,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
 
         <tr width="600">
-            <td class='details-col-elapsed'>5</td>
-            <td class='details-col-elapsed'>5</td>
-            <td class='details-col-elapsed'>0分4秒</td>
+            <td class='details-col-elapsed'>1</td>
+            <td class='details-col-elapsed'>1</td>
+            <td class='details-col-elapsed'>0分8秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -93,37 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/医院注册_正常注册_私立医院/log.html' target='_blank'>医院注册_正常注册_私立医院</a></td>
+            <td class="details-col-elapsed"><a href='../log/r_b8库房管理_库区设置_同步库房信息/log.html' target='_blank'>r_b8库房管理_库区设置_同步库房信息</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">0.287</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/医院注册_注册时医院已存在/log.html' target='_blank'>医院注册_注册时医院已存在</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">0.326</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/医院注册正常注册公立医院/log.html' target='_blank'>医院注册正常注册公立医院</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">0.241</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/注册医院审核通过/log.html' target='_blank'>注册医院审核通过</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">2.341</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/注册医院审核驳回/log.html' target='_blank'>注册医院审核驳回</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">1.283</td>
+            <td class="details-col-elapsed">8.637</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>