流程十二脚本编写

air_case/b5_spd3_core_business_flow/a_b7流程十四退库业务_消耗退库.air/a_b7流程十四退库业务_消耗退库.py

@@ -162,8 +162,8 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
         orgCode1 = get_orgCode()
         orgName1 = get_orgName()
         print(orgCode1, orgName1)
-        import pdb
-        pdb.set_trace()
+        # import pdb
+        # pdb.set_trace()
         request_body = commonFuc().get_business_data(module, "payload50_1_3", stockId, stockName2, areaCode,
                                                      areaName,
                                                      uxid, userLoginCode, cname, get_hosid(), get_branch_id(),
@@ -181,19 +181,18 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
                                                      tbStatus, purBillId,
                                                      distrBillId,
                                                      inStockTime, distrDetailId, purMode, price, goodsMfrsName,
-                                                     goodsSpec, unit, goodsName,unitName,
+                                                     goodsSpec, unit, goodsName, unitName,
                                                      hosGoodsCode, purModeText)
         print('request_body', '高值消耗出库', request_body)
 
         # # # # 发送请求
         result = commonFuc().http_post(url, request_body, headers)
         print('result', result)
-    elif type==1:
+    elif type == 1:
         print('低值耗材消耗出库')
         udi_code = get_udi2(1)
-        data1 = pickScan3(udi_code, 1)
+        data1 = pickScan4(udi_code)
         # 获取必要信息
-        data1 = commonFuc().analysis_json('data', result)
         areaCode = commonFuc().analysis_json('areaCode', data1)
         UTid = commonFuc().analysis_json('id', data1)
         createTime = commonFuc().analysis_json('id', data1)
@@ -252,6 +251,7 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                                  "dept_stock_out_submit_url")
 
+        deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"]
         deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"]
         deptName2 = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"]
         stockName2 = deptName2 + "库房"
@@ -267,29 +267,34 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
         cname = username
         orgCode1 = get_orgCode()
         orgName1 = get_orgName()
-        print(orgCode1, orgName1)
+        url2 = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+                                                                                 "herpService_stockpile_list_url")
+
+        request_body2 = commonFuc().get_business_data(module, "payload62", stockId, stockName2, areaCode,areaName,get_hosid())
+        # # # # 发送请求
+        result2 = commonFuc().http_post(url2, request_body2, headers)
+        availableQty=commonFuc().analysis_json('availableQty',commonFuc().analysis_json('data',commonFuc().analysis_json('data',result2)))
+        transferRatio=commonFuc().analysis_json('transferRatio',commonFuc().analysis_json('data',commonFuc().analysis_json('data',result2)))
+        print('result2', result2)
         request_body = commonFuc().get_business_data(module, "payload50_1_4", stockId, stockName2, areaCode,
-                                                     areaName,
+                                                     areaName, get_hosid(), deptid2,
                                                      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, areaCode, areaName, shelfCode,
-                                                     codeType, hosGoodsId, mdmGoodsCode, goodsCode, goodsDi,
-                                                     barName,
-                                                     batchCode, expdtDate, productDate, pkgCode, pkgCodeSee,
-                                                     ssccCode,
-                                                     tbStatus, pkgDefId, pkgDefQty, purBillId, pkgDefName,
-                                                     distrBillId,
-                                                     inStockTime, distrDetailId, purMode, price, goodsMfrsName,
-                                                     goodsSpec, unit, goodsName, pkgDefId, pkgDefQty, unitName,
-                                                     hosGoodsCode, purModeText)
-
-
-
+                                                     stockId,
+                                                     stockName2, areaCode, areaName, areaCode,
+                                                     purMode,
+                                                     hosGoodsId, goodsCode, batchCode, expdtDate, goodsSpec, goodsName,
+                                                     goodsMfrsName, unit, mdmGoodsCode, availableQty, transferRatio
+                                                     )
+        # import pdb
+        # pdb.set_trace()  # 设置断点
+        print('request_body',request_body)
+        # # # # 发送请求
+        result= commonFuc().http_post(url, request_body, headers)
+        print('result', result)
 def sCan_grant(type=1):  # 获取条码and扫码发放高值不能发放
     module = "b5_spd3_core_business_flow"
     # # 登录获取用户id等信息，使用创建的用户登录===========开始
@@ -315,22 +320,11 @@ def sCan_grant(type=1):  # 获取条码and扫码发放高值不能发放
 try:
     updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))  # 设置登录账号默认权限是二级库
     # sCan_grant(1)#低值扫码发放
-    # sCan_grant(3)#试剂扫码发放
-    # # # # 高值
-    second_dept_consume_Out_Stock(2)
-    # # # # 低值
-    # second_dept_consume_Out_Stock(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
-    # # # # 试剂
-    # second_dept_consume_Out_Stock(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
-    #
-    # for i in range(6):  # 三个单据共审批6次
-    #     approval_center()
-    # updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))  # 设置登录账号默认权限是二级库
-    #
-    # # 低值拣货执行
-    # second_dept_one_key_in(3)
-    # second_dept_one_key_in(3)
-    # second_dept_one_key_in(3)
+    sCan_grant(3)#试剂扫码发放
+    # second_dept_consume_Out_Stock(2)#高值消耗出库
+    second_dept_consume_Out_Stock(1)  #低值消耗出库
+    second_dept_consume_Out_Stock(3)  #试剂消耗出库
+
     commonFuc().check_text_exist_result_text('succees', 'succees')
 except:
     commonFuc().check_text_exist_result_text('error', '1')

air_case/public1/public1/public1.py

@@ -2545,6 +2545,34 @@ def pickScan2(PICK_ID, udi_code, type=1):  # 二级库出库拣货扫码
     print('result', result)
     return areaCode, pickerId
 
+def pickScan4(udi_code):  # 二级库扫码 只扫码不发放
+    module = "b5_spd3_core_business_flow"
+    # # 登录获取用户id等信息，使用创建的用户登录===========开始
+    info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+    username = info['username1']
+    password = commonFuc().get_business_data("b2_herp3_bs", "password")
+    print('username,password', username, password)
+    # # 获取token和projectCode
+    token, projectCode, uxid, corpId, info = login(username, password, 2)
+    # 登录获取用户id等信息，使用创建的用户登录============结束
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            commonFuc().get_business_data(module, "X-APP-CODE"))
+    # ==============================获取条码信息
+    url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_stock_pick_scan_url")
+    print('获取条码信息url', url)
+
+    deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"]
+    deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"]
+    stockId = get_stockId(deptName + '库房', 2)
+    deptName2 = deptName + '库房'
+    areaCode = get_stockAreaId_new(deptid2, deptName, 2)
+    request_body = commonFuc().get_business_data(module, "payload60", udi_code, stockId, deptName2, areaCode)
+    print('获取条码信息request_body', request_body)
+    result = commonFuc().http_post(url, request_body, headers)
+    print('获取条码信息result', result)
+    data1 = commonFuc().analysis_json('data', result)
+    return data1
 
 def pickScan3(udi_code, type=1):  # 二级库扫码发放(高值产品不能扫码发放)
     module = "b5_spd3_core_business_flow"
@@ -2687,8 +2715,6 @@ def pickScan3(udi_code, type=1):  # 二级库扫码发放(高值产品不能扫
     # # # # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
     print('result', result)
-    return data1
-
 
 def get_branch_name():
     return FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_name"]

data/b5_spd3_core_business_flow/data

@@ -66,7 +66,7 @@
 "herpService_stock_pick_scan_url": "/api/herpService/pick/scan"
 "herpService_stock_out_use_buyInfo_url": "/api/herpService/stock/out/use/buyInfo/"
 "herpService_stock_out_use_submit_url": "/api/herpService/stock/out/use/submit"
-
+"herpService_stockpile_list_url": "/api/herpService/stockpile/list"
 
 "username": "xhs1009"
 "username2": "test001"
@@ -148,7 +148,7 @@ json_headers2: {
 "payload50_1_1": {"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":{"pkgDefId":"%s","pkgDefQty":100,"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":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_1_2": {"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","sourceType":"CK_CB","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_CB","pickCreateVO":{"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":"100","printNum":0,"deptId":null,"deptName":null,"billId":null,"taskId":null,"made":"德国","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}]}}
 "payload50_1_3": {"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","patientId":"","patientName":"","consumeType":2,"chargeDeptId":"","sourceType":"CK_XH","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_XH","pickCreateVO":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","patientId":"","patientName":"","consumeType":2,"chargeDeptId":"","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":"德国","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}]}}
-"payload50_1_4": {"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","outType":"1","patientId":"","patientName":"","consumeType":1,"sourceType":"CK_XH","hosId":"%s","pickType":"KS_XH","deptId":"%s","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":"%s","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},"pickCreateVO":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","outType":"1","patientId":"","patientName":"","consumeType":1,"barCodeList":[{"id":"","lastModified":null,"version":null,"createTime":null,"createUser":null,"lastModifiedUser":null,"hosId":null,"branchId":null,"deptId":null,"deptName":null,"stockId":null,"stockName":null,"areaCode":"%s","areaName":null,"purMode":"%s","hosGoodsId":"%s","goodsCode":"%s","batchCode":"%s","expdtDate":"%s","hosBatchId":null,"batchPrice":null,"qty":1,"shelfCode":null,"barcodeFlag":null,"pkgFlag":null,"goodsSpec":"%s","goodsName":"%s","goodsMfrsName":"%s","unit":"%s","miCode":"","miDjmc":"","mdmGoodsCode":"%s","availableQty":"%s","transferRatio":"%s","shelfNo":null,"detailId":null,"pickId":null,"provId":null,"provName":null,"subProvId":null,"subProvName":null,"subSendFlag":null,"subSendFlagText":null}]}}
+"payload50_1_4": {"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","outType":"1","patientId":"","patientName":"","consumeType":1,"sourceType":"CK_XH","hosId":"%s","pickType":"KS_XH","deptId":"%s","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},"pickCreateVO":{"stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","outType":"1","patientId":"","patientName":"","consumeType":1,"barCodeList":[{"id":"","lastModified":null,"version":null,"createTime":null,"createUser":null,"lastModifiedUser":null,"hosId":null,"branchId":null,"deptId":null,"deptName":null,"stockId":null,"stockName":null,"areaCode":"%s","areaName":null,"purMode":"%s","hosGoodsId":"%s","goodsCode":"%s","batchCode":"%s","expdtDate":"%s","hosBatchId":null,"batchPrice":null,"qty":1,"shelfCode":null,"barcodeFlag":null,"pkgFlag":null,"goodsSpec":"%s","goodsName":"%s","goodsMfrsName":"%s","unit":"%s","miCode":"","miDjmc":"","mdmGoodsCode":"%s","availableQty":"%s","transferRatio":"%s","shelfNo":null,"detailId":null,"pickId":null,"provId":null,"provName":null,"subProvId":null,"subProvName":null,"subSendFlag":null,"subSendFlagText":null}]}}
 
 "payload51": "%s"
 "payload51_1_1": {"targetAreaCode":"%s","billMode":16,"consumeType":0,"patientId":"","patientName":"","programType":"","sourceId":"%s","sourceType":"CK_SL","sourceVersion":0,"targetAreaName":"","targetBranchId":"","targetDeptId":"","targetDeptName":"","targetStockId":""}
@@ -172,3 +172,4 @@ json_headers2: {
 "payload59": {"tbStatus":20,"code":"%s","areaCode":"","ignoreValidExpDate":true,"pickType":"KS_SL"}
 "payload60": {"pickType":"KS_CB","tbStatus":20,"code":"%s","stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"默认库区","ignoreValidExpDate":false}
 "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}
\ No newline at end of file

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202406060021
-  distrBillId2: PSh0347202406060021
+  distrBillId1: PSh0347202406060036
+  distrBillId2: PSh0347202406060036
 高值配送单号:
-  distrBillId1: PSh0347202406060022
-  distrBillId2: PSh0347202406060022
+  distrBillId1: PSh0347202406060037
+  distrBillId2: PSh0347202406060037
 试剂配送单号:
-  distrBillId1: PSh0347202406060023
-  distrBillId2: PSh0347202406060023
+  distrBillId1: PSh0347202406060038
+  distrBillId2: PSh0347202406060038

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024060625712
-  orderNo2: PLAN2024060625712
+  orderNo1: PLAN2024060625755
+  orderNo2: PLAN2024060625755

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024060625714
-  orderNo2: PLAN2024060625714
+  orderNo1: PLAN2024060625757
+  orderNo2: PLAN2024060625757

data/b5_spd3_core_business_flow/message13

@@ -8,22 +8,22 @@
       taskType: 1
       sourceOrgId: p1e276
       sourceOrgName: 国药集团公司LK05j
-      sourceOrderNo: PSh0347202406060023
+      sourceOrderNo: PSh0347202406060038
       billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202406060023
+      sourceId: PSh0347202406060038
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024060625714
-      purOrderNo: CG2024060617963
+      planOrderNo: PLAN2024060625757
+      purOrderNo: CG2024060617979
       recOrgId: 82394e14fcd94eb6ad2474304cb2a808
       recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024060600015","planBillId":"Ph034720240606022359","planOrderNo":"PLAN2024060625714","buyOrderNo":"BUY2024060604737","purOrderNo":"CG2024060617963","purBillId":"Ch034720240606000078","purBillDate":"2024-06-06
-        07:38:40","distrBillId":"PSh0347202406060023","distrOrderNo":"PSh0347202406060023"}'
-      taskDate: '2024-06-06 07:39:24'
+      billRelationJson: '{"buyBillId":"Bh03472024060600032","planBillId":"Ph034720240606022402","planOrderNo":"PLAN2024060625757","buyOrderNo":"BUY2024060604754","purOrderNo":"CG2024060617979","purBillId":"Ch034720240606000094","purBillDate":"2024-06-06
+        11:30:03","distrBillId":"PSh0347202406060038","distrOrderNo":"PSh0347202406060038"}'
+      taskDate: '2024-06-06 11:30:42'
       taskDateStart:
       taskDateEnd:
       billModeList:

data/b5_spd3_core_business_flow/message14

@@ -26,10 +26,10 @@
       productDate: '2024-06-06'
       provName: 国药集团公司LK05j
       provId:
-      viewId: '03838159'
+      viewId: '03838174'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03838159'
+      id: '03838174'
       detailRelationJson:
       extInfo: '{"goodsGg":"G-31891","goodsCode":"00004010","purMode":60,"goodsName":"新型冠状病毒检测试剂20zyQ","ygptCode":"","transCond":"","storageCond":"","erpCode":"11660958","ybDefId":""}'
       recTemperature: 20

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024060600014
-  CHECK_NO2: CHECKh03472024060600014
+  CHECK_NO1: CHECKh03472024060600031
+  CHECK_NO2: CHECKh03472024060600031

data/b5_spd3_core_business_flow/message18

 条码信息:
   list_a:
   - &id001
-    id: UT240606000701
-    snCode: UT240606000701
-    ssccCode: '010839000183220922'
-    pkgCodeSee: 0136550000040100104444112406061724121321UT240606000701
-    hosGoodsId: h034700004010
-    hosGoodsCode: '00004010'
-    goodsCode: '00004010'
-    goodsName: 新型冠状病毒检测试剂20zyQ
+    id: UT240606000907
+    snCode: UT240606000907
+    ssccCode: '010839000183243921'
+    pkgCodeSee: 013655000004009010333112406061724121321UT240606000907
+    hosGoodsId: h034700004009
+    hosGoodsCode: '00004009'
+    goodsCode: '00004009'
+    goodsName: 一次性注射器_低值vYh04
     goodsSpec: G-31891
     goodsMfrsName: 德国歌德公司 Geuder AG
     unit: 支
-    purMode: 60
-    batchCode: '4444'
+    purMode: 10
+    batchCode: '333'
     productDate: '2024-06-06'
     expdtDate: '2024-12-13'
     pkgDefName: '100'
     pkgDefQty: 100.0
-    stockId: 2ca86f5a96044b21899027321759fc3e
-    stockName: 东土城路院区nzo#r中心库房
-    areaName: 自动化测试
-    areaCode: areah03472220
+    stockId: 4d5e04c549d04b3f8e0aee9e280d2cb6
+    stockName: 二级检验科002库房
+    areaName: 默认库区
+    areaCode: areah03472218
     lockStatus: 0
     unitName: 100支/100
-    shelfCode: areah03472220-2-01-01
-    shelfNo: 自动化测试-2-01-01
-    pkgDefId: 60abe88ab2b5432da8f7e75a74e92584
-    extInfo: '{"pkgDefId": "60abe88ab2b5432da8f7e75a74e92584", "pkgDefQty": 100, "purBillId":
-      "CG2024060617956", "pkgDefName": "100", "distrBillId": "PSh0347202406060013",
-      "inStockTime": "2024-06-06 07:19:01", "distrDetailId": "03838149", "certificateCode":
+    shelfCode: areah03472218-A-01-01
+    shelfNo: A01-A-01-01
+    pkgDefId: e0b21bdcd917429980f0f5aa6cbc98d0
+    extInfo: '{"pkgDefId": "e0b21bdcd917429980f0f5aa6cbc98d0", "pkgDefQty": 100, "purBillId":
+      "CG2024060617974", "pkgDefName": "100", "distrBillId": "PSh0347202406060030",
+      "inStockTime": "2024-06-06 11:25:54", "distrDetailId": "03838166", "certificateCode":
       ""}'
     bottleId:
-    pkgType: '66'
+    pkgType: '16'
     miDjmc: ''
     miCode: ''
     transferRatio: 1.0
@@ -41,13 +41,13 @@
     shelfKindName: 普通货位
     provName: 国药集团公司LK05j
     provId: p1e276
-    inStockDate:
+    inStockDate: '2024-06-06 11:25:54'
     mfrCode:
     made: 德国
     price:
     barName: 100支/100
-    purModeText: 检验试剂
-    codeType: 66
+    purModeText: 低值耗材
+    codeType: 16
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message21

@@ -16,7 +16,7 @@
       pkgDefName: '100'
       pkgDefQty: 100.0
       pkgQty:
-      qty: 300.0
+      qty: 600.0
       goodsImg: []
       pkgDefId: 60abe88ab2b5432da8f7e75a74e92584
       buyPkgQty:

data/b5_spd3_core_business_flow/message7

 采购计划单号:
-  orderNo1: PLAN2024060625713
-  orderNo2: PLAN2024060625713
+  orderNo1: PLAN2024060625756
+  orderNo2: PLAN2024060625756

data/b5_spd3_core_business_flow/message8

 配送订单信息:
   list_a:
   - &id001
-    - id: Ch034720240606000078
-      lastModified: '2024-06-06 07:38:40'
+    - id: Ch034720240606000094
+      lastModified: '2024-06-06 11:30:03'
       version: 0
-      createTime: '2024-06-06 07:38:40'
+      createTime: '2024-06-06 11:30:03'
       createUser: h0347_UID-051316
       lastModifiedUser:
-      orderNo: CG2024060617963
+      orderNo: CG2024060617979
       billMode: '66'
       recType: HDI
       hosId: h0347
@@ -19,7 +19,7 @@
       areaCode:
       areaName:
       billExpdtDate:
-      sourceId: Ph034720240606022359
+      sourceId: Ph034720240606022402
       sourceType:
       inSettlement:
       recUser:
@@ -47,7 +47,7 @@
       sumQty: 100.0
       sumPkgQty: 1.0
       sumAmount: '9999.9900'
-      planOrderNo: PLAN2024060625714
+      planOrderNo: PLAN2024060625757
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message9

 配送订单详细信息:
   list_a:
   - &id001
-    - id: 713e167638ba4e5c9a5a78fde53dd2c7
+    - id: 9971233e6bc94476b9028c70aea97160
       lastModified:
       version:
       createTime:
       createUser:
       lastModifiedUser:
-      pid: Ch034720240606000078
-      orderNo: CG2024060617963
-      sourceId: cdb4324be0d240b3a4fab9e05e0487c4
+      pid: Ch034720240606000094
+      orderNo: CG2024060617979
+      sourceId: 8cae32ce2202487aa5f0321f035572c0
       hosGoodsId: h034700004010
       mdmGoodsCode: '11660958'
       goodsCode: '00004010'
@@ -31,7 +31,7 @@
       notSendPkgQty: 0.0
       inSettlement: 1
       closeType: 1
-      detailRelationJson: '{"planBillId":"Ph034720240606022359","buyDetailId":"Bh034720240606000150001","planDetailId":"cdb4324be0d240b3a4fab9e05e0487c4"}'
+      detailRelationJson: '{"planBillId":"Ph034720240606022402","buyDetailId":"Bh034720240606000320001","planDetailId":"8cae32ce2202487aa5f0321f035572c0"}'
       extInfo: '{"goodsGg":"G-31891","goodsCode":"00004010","purMode":60,"goodsName":"新型冠状病毒检测试剂20zyQ"}'
       remark:
       tbStatus:

report/summary.html

@@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
 
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>0</td>
-            <td class='details-col-elapsed'>0分31秒</td>
-            <td class="details-col-elapsed">0.0%</td>
+            <td class='details-col-elapsed'>1</td>
+            <td class='details-col-elapsed'>0分25秒</td>
+            <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
 
@@ -94,8 +94,8 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         
         <tr width="600">
             <td class="details-col-elapsed"><a href='../log/a_b7流程十四退库业务_消耗退库/log.html' target='_blank'>a_b7流程十四退库业务_消耗退库</a></td>
-            <td class="fail">失败</td>
-            <td class="details-col-elapsed">31.475</td>
+            <td class="success">成功</td>
+            <td class="details-col-elapsed">25.375</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>