流程十二脚本编写

air_case/b5_spd3_core_business_flow/a_b8流程十五退库业务_三级库向二级库退库.air/a_b8流程十五退库业务_三级库向二级库退库.py

@@ -76,13 +76,21 @@ def second_dept_return_Out_Stock(type):  # 三级库退货出库
         stockName = commonFuc().analysis_json('stockName', list_a)
         areaCode = commonFuc().analysis_json('areaCode', list_a)
         areaName = commonFuc().analysis_json('areaName', list_a)
+        deptId3= FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid3"]
+        targetDeptId= FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"]
+        deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"]
+        targetStockId =get_stockId(deptName+'库房',2)
+        import pdb
+        pdb.set_trace()
 
-        request_body = commonFuc().get_business_data(module, "payload61", udi_code, stockId, stockName, areaCode,
-                                                     areaName)
+        request_body = commonFuc().get_business_data(module, "payload65", udi_code, stockId, deptId3,areaCode, areaName,
+                                                     targetStockId,targetDeptId)
+        print('request_body',request_body)
         result = commonFuc().http_post(url, request_body, headers)
+        print('退库出库扫码result',result)
         # 获取必要信息
         deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"]
-        deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"]
+
         data1 = commonFuc().analysis_json('data', result)
         areaCode = commonFuc().analysis_json('areaCode', data1)
         UTid = commonFuc().analysis_json('id', data1)
@@ -162,14 +170,14 @@ def second_dept_return_Out_Stock(type):  # 三级库退货出库
         print(orgCode1, orgName1)
 
         request_body = commonFuc().get_business_data(module, "payload50_2_3", stockId, stockName2, areaCode,
-                                                     areaName,
+                                                     areaName,targetStockId,targetDeptId,
                                                      uxid, userLoginCode, cname, get_hosid(), get_branch_id(),
                                                      deptid1,
                                                      orgCode1, orgName1, get_hosid(), get_hosid(), mgrCorpName,
                                                      get_branch_id(),
                                                      get_branch_name(), mgrRangeId, mgrRangeName, extStr1, extStr3,
-                                                     get_hosid(), stockId,
-                                                     stockName2, areaCode, areaName, UTid, createTime, snCode,
+                                                     get_hosid(), stockId,deptId3,
+                                                     areaCode, areaName, targetStockId, targetDeptId, UTid,createTime,snCode,
                                                      get_hosid(), stockId, areaCode, areaName, shelfCode,
                                                      codeType, hosGoodsId, mdmGoodsCode, goodsCode, goodsDi,
                                                      barName,
@@ -178,7 +186,7 @@ def second_dept_return_Out_Stock(type):  # 三级库退货出库
                                                      tbStatus, purBillId,
                                                      distrBillId,
                                                      inStockTime, distrDetailId, purMode, price, goodsMfrsName,
-                                                     goodsSpec, unit, goodsName, unitName,
+                                                     goodsSpec, unit, goodsName,made, unitName,
                                                      hosGoodsCode, purModeText)
         print('request_body', '高值消耗出库', request_body)
 

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202406110038
-  cname: 国药集团公司5AaDk
+  e_id: CR202406120038
+  cname: 国药集团公司2u7a4

data/a3_mdm3_hs/message

 医院信息:
-  h_id: 湖南省人民医院x#B5N
-  h_name: 湖南省人民医院x#B5N
+  h_id: 湖南省人民医院$y(&u
+  h_name: 湖南省人民医院$y(&u

data/a5_mdm3_pdm/message2

 产品审核信息:
-  MSPid: MSP2406110011_1
+  MSPid: MSP2406120011_1
   hosId: h0347
-  hosGoodsId: h034700004067
-  provGoodsid: provGood-99221254
-  goodsAuditBillId: MSP2406110011
-  targetId: MSP2406110011_1
+  hosGoodsId: h034700004078
+  provGoodsid: provGood-99221265
+  goodsAuditBillId: MSP2406120011
+  targetId: MSP2406120011_1

data/a6_mdm3_si/message

@@ -2,10 +2,10 @@
   list_a:
   - &id001
     settleMonth: '202406'
-    pid: OBh0347202406110004
-    hosGoodsId: h034700004064
-    goodsCode: '00004064'
-    goodsName: 一次性注射器_低值iE$e8
+    pid: OBh0347202406120004
+    hosGoodsId: h034700004075
+    goodsCode: '00004075'
+    goodsName: 一次性注射器_低值xaYjQ
     goodsGg: G-31891
     mfrsName: 德国歌德公司 Geuder AG
     unit: 支
@@ -20,13 +20,13 @@
     normalContractId:
     normalContract: '1'
     detailList:
-    - pid: OBh0347202406110004
+    - pid: OBh0347202406120004
       settleMonth: '202406'
-      hosGoodsId: h034700004064
+      hosGoodsId: h034700004075
       batchCode: '333'
-      distrDetailId: '03838321'
-      distrId: PSh0347202406110005
-      distrOrderNo: PSh0347202406110005
+      distrDetailId: '03838369'
+      distrId: PSh0347202406120005
+      distrOrderNo: PSh0347202406120005
       settlePrice: 99.9999
       maxSettleQty: -100.0
       maxSettleAmount: -9999.99
@@ -35,11 +35,11 @@
       leftSettleQty: -100.0
       leftSettleAmount: -9999.99
       hosId: h0347
-      provId: p1e28a
-      branchId: h0347-3665
-      balanceDetId: OBh0347202406110004-000001
+      provId: p1e28e
+      branchId: h0347-3667
+      balanceDetId: OBh0347202406120004-000001
       purMode: 10
-      barCode: 013665000004064010333112406111724121821UT240611000202
+      barCode: 013667000004075010333112406121724121921UT240612000202
       batchId:
       price:
       maxQty:
@@ -52,14 +52,14 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202406OBh0347202406110004h034700004064
-    - pid: OBh0347202406110004
+      viewId: 202406OBh0347202406120004h034700004075
+    - pid: OBh0347202406120004
       settleMonth: '202406'
-      hosGoodsId: h034700004064
+      hosGoodsId: h034700004075
       batchCode: '333'
-      distrDetailId: '03838321'
-      distrId: PSh0347202406110005
-      distrOrderNo: PSh0347202406110005
+      distrDetailId: '03838369'
+      distrId: PSh0347202406120005
+      distrOrderNo: PSh0347202406120005
       settlePrice: 99.9999
       maxSettleQty: 100.0
       maxSettleAmount: 9999.99
@@ -68,11 +68,11 @@
       leftSettleQty: 100.0
       leftSettleAmount: 9999.99
       hosId: h0347
-      provId: p1e28a
-      branchId: h0347-3665
-      balanceDetId: OBh0347202406110004-000002
+      provId: p1e28e
+      branchId: h0347-3667
+      balanceDetId: OBh0347202406120004-000002
       purMode: 10
-      barCode: 013665000004064010333112406111724121821UT240611000220
+      barCode: 013667000004075010333112406121724121921UT240612000286
       batchId:
       price:
       maxQty:
@@ -85,10 +85,10 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202406OBh0347202406110004h034700004064
-    unique: 202406OBh0347202406110004h034700004064
+      viewId: 202406OBh0347202406120004h034700004075
+    unique: 202406OBh0347202406120004h034700004075
     onlineKind: '10'
-    viewId: 202406OBh0347202406110004h034700004064
+    viewId: 202406OBh0347202406120004h034700004075
   list_b:
   - *id001
   list_c:

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3665
-  branch_name: 东土城路院区vfAtR
+  branch_id: h0347-3667
+  branch_name: 东土城路院区!uON*
 科室信息:
-  dept2_id: 38197ff974f8454bbb30b8f18b9de57b
+  dept2_id: a463883417d44685862ebc9eb9c62990
   dept2_name: 二级检验科002

data/b2_herp3_bs/message3

 用户名信息:
-  username1: 自动化测试ueoQR
-  username2: 自动化测试ueoQR
+  username1: 自动化测试ujscw
+  username2: 自动化测试ujscw

data/b2_herp3_bs/message4

 一级科室信息:
-  dept1_id: 6b8df290f73d41b3b0e5516361749b4c
+  dept1_id: 42d415ddd37444858d61aa923d936b16
   dept1_name: 设备科001

data/b2_herp3_bs/message5

 部门和库区信息:
-  dept1_id: 6b8df290f73d41b3b0e5516361749b4c
-  stockAreaId: 5da57cb463464c8b9d788dfcbf72c0d9
+  dept1_id: 42d415ddd37444858d61aa923d936b16
+  stockAreaId: 024aedc366c34170bc51f39512b20212

data/b2_herp3_bs/message6

 所有科室id:
-  deptid1: 6b8df290f73d41b3b0e5516361749b4c
-  deptid2: 38197ff974f8454bbb30b8f18b9de57b
-  deptid3: 29b06dee6cf84ae595994651e2a37cf1
-  deptid4: 7988996bffd64edb8b9d475501f3220f
-  deptid5: b2ab02fbef3c48988315df466e82be27
+  deptid1: 42d415ddd37444858d61aa923d936b16
+  deptid2: a463883417d44685862ebc9eb9c62990
+  deptid3: f7dc795546bf4722982f8b7c5632e83f
+  deptid4: 590524f6ba7c4daea481ef39df0b3517
+  deptid5: 8cb36be87c864daeb3499d5f6f781fb3
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002

data/b2_herp3_bs/message7

 shelfinfo:
-  shelfid: 5da57cb463464c8b9d788dfcbf72c0d9
-  shelfCode: areah03472279
+  shelfid: 024aedc366c34170bc51f39512b20212
+  shelfCode: areah03472291
   areaName: 自动化测试

data/b5_spd3_core_business_flow/data

@@ -165,7 +165,188 @@ json_headers2: {
 "payload52": {"batchList":[{"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":"%s","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":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","pkgDefId":"%s","pkgDefName":"%s"},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":"%s","pkgDefQty":"%s","purDetailId":null,"pkgDefName":"%s","printNum":0,"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":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null}],"sourceId":"%s","sourceType":"KS","sourceVersion":"3","remark":"","reviewAll":0}
 "payload50_2": {"areaCode":"%s","hdiList":[{"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":"%s","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":{"distrDetailId":"%s","distrBillId":"%s","certificateCode":"","purBillId":"%s","pkgDefQty":"%s","multiChargeFlag":0,"useFrequency":1},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":null,"pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":null,"pkgDefQty":null,"purDetailId":null,"pkgDefName":null,"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":null,"areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"%s","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":null,"transferRatio":1,"miDjmc":null,"tbStatusList":null,"purModeText":null,"stockName":null,"tbStatusText":null,"pkgType":null,"bottleId":null,"pkgStatus":null,"qty":null,"packUnit":null,"minSaleQty":null,"rfidFlag":null,"mfrCodeFlag":null,"scanStatus":null,"scanId":null,"multiChargeFlag":null,"useFrequency":null,"chargeUnit":null,"lockStatus":null,"remark":null}],"id":"%s","areaName":"%s","stockName":"%s"}
 "payload50_2_2": {"areaCode":"%s","areaName":"%s","hdiList":[{"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":{"pkgDefQty":1,"purBillId":"%s","distrBillId":"%s","inStockTime":"%s","useFrequency":1,"distrDetailId":"%s","certificateCode":"","multiChargeFlag":0},"sourceDetailId":null,"purMode":"%s","purModes":null,"price":"%s","pid":null,"goodsMfrsName":"%s","mfrsName":null,"goodsSpec":"%s","unit":"%s","goodsName":"%s","pkgDefId":null,"pkgDefQty":null,"defaultPkgDefQty":null,"defaultQty":null,"defaultSurplusQty":null,"defaultPkgDefId":null,"purDetailId":null,"pkgDefName":null,"printNum":0,"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}],"id":"%s","pickerId":"%s","version":0,"stockName":"%s"}
-
+"payload50_2_3": {
+    "remark": "",
+    "stockId": "%s",
+    "deptId": "%s",
+    "reasonKind": "11",
+    "areaCode": "%s",
+    "areaName": "%s",
+    "targetStockId": "%s",
+    "targetDeptId": "%s",
+    "sourceType": "CK_TK",
+    "user": {
+        "uxid": "%s",
+        "userLoginCode": "%s",
+        "employeeNo": null,
+        "cname": "%s",
+        "corpId": "%s",
+        "corpCode": null,
+        "corpKind": 1,
+        "corpName": null,
+        "branchId": "%s",
+        "branchName": null,
+        "orgId": "%s",
+        "orgCode": "%s",
+        "orgName": "%s",
+        "job": null,
+        "tel": "xhs0301",
+        "email": null,
+        "mgrCorpId": "%s",
+        "mgrCorpCode": "%s",
+        "mgrCorpKind": 1,
+        "mgrCorpName": "%s",
+        "mgrBranchId": "%s",
+        "mgrBranchName": "%s",
+        "mgrRangeId": "%s",
+        "mgrRangeName": "%s",
+        "extStr1": "%s",
+        "extStr2": null,
+        "extStr3": "%s",
+        "roles": [
+            {
+                "roleCode": "ro00442",
+                "roleName": "医院管理员"
+            }
+        ],
+        "wechatNickName": null,
+        "mgrDeptKind": null,
+        "adminFlag": null,
+        "datascopeMap": null,
+        "dataGroupList": null,
+        "workFlowGroupSimpleVOList": null,
+        "extMap": null
+    },
+    "hosId": "%s",
+    "pickType": "KS_TK",
+    "pickCreateVO": {
+        "remark": "",
+        "stockId": "%s",s
+        "deptId": "%s",
+        "reasonKind": "11",
+        "areaCode": "%s",
+        "areaName": "%s",
+        "targetStockId": "%s",
+        "targetDeptId": "%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": {
+                    "pkgDefQty": 1,
+                    "purBillId": "%s",
+                    "distrBillId": "%s",
+                    "inStockTime": "%s",
+                    "useFrequency": 1,
+                    "distrDetailId": "%s",
+                    "certificateCode": "",
+                    "multiChargeFlag": 0
+                },
+                "sourceDetailId": null,
+                "purMode": "%s",
+                "purModes": null,
+                "price": "%s",
+                "pid": null,
+                "goodsMfrsName": "%s",
+                "mfrsName": null,
+                "goodsSpec": "%s",
+                "unit": "%s",
+                "goodsName": "%s",
+                "pkgDefId": null,
+                "pkgDefQty": null,
+                "defaultPkgDefQty": null,
+                "defaultQty": null,
+                "defaultSurplusQty": null,
+                "defaultPkgDefId": null,
+                "purDetailId": null,
+                "pkgDefName": null,
+                "printNum": 0,
+                "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
+            }
+        ]
+    }
+}
 
 "payload53": {"queryObject":{"goodsName":"%s","goodsMfrsName":"","purModes":[],"hosId":"%s","branchId":"%s","goodsSpec":"","importGrantRule":2,"deptId":"%s"},"pageNum":1,"pageSize":50}
 "payload53_2": {"queryObject":{"goodsName":"%s","goodsMfrsName":"","purModes":[],"hosId":"%s","branchId":"%s","grantRule":2,"goodsSpec":"","deptId":"%s"},"pageNum":1,"pageSize":50}
@@ -181,4 +362,5 @@ json_headers2: {
 "payload61": {"pickType":"KS_XH","tbStatus":20,"code":"%s","stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","patientId":"","patientName":"","consumeType":2,"chargeDeptId":"","ignoreValidExpDate":false}
 "payload62": {"queryObject":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","outType":"1","patientId":"","patientName":"","consumeType":1,"hosId":"%s","goodsName":"","goodsSpec":"","purMode":"10"},"pageNum":1,"pageSize":50}
 "payload63": {"queryObject":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","patientId":"","patientName":"","consumeType":"1","hosId":"%s","orderNo":"","goodsName":"","goodsSpec":"","purMode":"10","billMode":"10"},"pageNum":1,"pageSize":50}
-"payload64": {"queryObject":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","inType":"0","bottleFlag":"1","patientId":"","patientName":"","consumeType":"1","hosId":"%s","goodsName":"","goodsSpec":"","orderNo":"","purMode":"60","billMode":"67"},"pageNum":1,"pageSize":50}
+"payload64": {"queryObject":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","inType":"0","bottleFlag":"1","patientId":"","patientName":"","consumeType":"1","hosId":"%s","goodsName":"","goodsSpec":"","orderNo":"","purMode":"60","billMode":"67"},"pageNum":1,"pageSize":50}
\ No newline at end of file
+"payload65": {"pickType":"KS_TK","tbStatus":20,"code":"%s","remark":"","stockId":"%s","deptId":"%s","reasonKind":"11","areaCode":"%s","areaName":"%s","targetStockId":"%s","targetDeptId":"%s"}

data/b5_spd3_core_business_flow/message

 供货关系申请2:
-  e_corpId: p1e28a
+  e_corpId: p1e28e
   h_corpId: h0347
-  e_username: 国药集团公司5AaDk
+  e_username: 国药集团公司2u7a4
   h_name: test001

data/b5_spd3_core_business_flow/message1

 产品审核信息:
-  MSPid: MSP2406110007_1
+  MSPid: MSP2406120007_1
   hosId: h0347
-  hosGoodsId: h034700004063
-  provGoodsid: provGood-99221250
-  goodsAuditBillId: MSP2406110007
-  targetId: MSP2406110007_1
+  hosGoodsId: h034700004074
+  provGoodsid: provGood-99221261
+  goodsAuditBillId: MSP2406120007
+  targetId: MSP2406120007_1

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202406110021
-  distrBillId2: PSh0347202406110021
+  distrBillId1: PSh0347202406120021
+  distrBillId2: PSh0347202406120021
 高值配送单号:
-  distrBillId1: PSh0347202406110022
-  distrBillId2: PSh0347202406110022
+  distrBillId1: PSh0347202406120022
+  distrBillId2: PSh0347202406120022
 试剂配送单号:
-  distrBillId1: PSh0347202406110023
-  distrBillId2: PSh0347202406110023
+  distrBillId1: PSh0347202406120023
+  distrBillId2: PSh0347202406120023

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024061127811
-  orderNo2: PLAN2024061127811
+  orderNo1: PLAN2024061228234
+  orderNo2: PLAN2024061228234

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024061127810
-  orderNo2: PLAN2024061127810
+  orderNo1: PLAN2024061228235
+  orderNo2: PLAN2024061228235

data/b5_spd3_core_business_flow/message13

@@ -3,27 +3,27 @@
   - &id001
     - id:
       hosId: h0347
-      branchId: h0347-3665
+      branchId: h0347-3667
       deptId:
       taskType: 1
-      sourceOrgId: p1e28a
-      sourceOrgName: 国药集团公司5AaDk
-      sourceOrderNo: PSh0347202406110023
+      sourceOrgId: p1e28e
+      sourceOrgName: 国药集团公司2u7a4
+      sourceOrderNo: PSh0347202406120023
       billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202406110023
+      sourceId: PSh0347202406120023
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024061127810
-      purOrderNo: CG2024061118455
-      recOrgId: 38197ff974f8454bbb30b8f18b9de57b
+      planOrderNo: PLAN2024061228235
+      purOrderNo: CG2024061218553
+      recOrgId: a463883417d44685862ebc9eb9c62990
       recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024061100014","planBillId":"Ph034720240611024455","planOrderNo":"PLAN2024061127810","buyOrderNo":"BUY2024061104897","purOrderNo":"CG2024061118455","purBillId":"Ch034720240611000083","purBillDate":"2024-06-11
-        07:41:54","distrBillId":"PSh0347202406110023","distrOrderNo":"PSh0347202406110023"}'
-      taskDate: '2024-06-11 07:42:18'
+      billRelationJson: '{"buyBillId":"Bh03472024061200014","planBillId":"Ph034720240612024880","planOrderNo":"PLAN2024061228235","buyOrderNo":"BUY2024061204935","purOrderNo":"CG2024061218553","purBillId":"Ch034720240612000077","purBillDate":"2024-06-12
+        07:41:28","distrBillId":"PSh0347202406120023","distrOrderNo":"PSh0347202406120023"}'
+      taskDate: '2024-06-12 07:41:51'
       taskDateStart:
       taskDateEnd:
       billModeList:
@@ -31,6 +31,7 @@
       supplierFlag: true
       tbStatus: 20
       remark: ''
+      pdaFlag:
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message14

@@ -3,11 +3,11 @@
   - &id001
     - purMode: 60
       unitName: 100支/100
-      hosGoodsId: h034700004065
+      hosGoodsId: h034700004076
       mdmGoodsCode:
-      spdGoodsCode: '11661013'
-      goodsCode: '00004065'
-      goodsName: 新型冠状病毒检测试剂!gUJE
+      spdGoodsCode: '11661024'
+      goodsCode: '00004076'
+      goodsName: 新型冠状病毒检测试剂DJUhI
       goodsGg: G-31891
       mfrsId:
       mfrsName: 德国歌德公司 Geuder AG
@@ -22,16 +22,16 @@
       pkgDefName: '100'
       pkgDefQty: 100.0
       batchCode: '4444'
-      expdtDate: '2024-12-18'
-      productDate: '2024-06-11'
-      provName: 国药集团公司5AaDk
+      expdtDate: '2024-12-19'
+      productDate: '2024-06-12'
+      provName: 国药集团公司2u7a4
       provId:
-      viewId: '03838339'
+      viewId: '03838387'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03838339'
+      id: '03838387'
       detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004065","purMode":60,"goodsName":"新型冠状病毒检测试剂!gUJE","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661013","ybDefId":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004076","purMode":60,"goodsName":"新型冠状病毒检测试剂DJUhI","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661024","ybDefId":""}'
       recTemperature: 20
       recHumidity: 30
       distrPrice: 99.9999

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024061100014
-  CHECK_NO2: CHECKh03472024061100014
+  CHECK_NO1: CHECKh03472024061200014
+  CHECK_NO2: CHECKh03472024061200014