脚本优化

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

@@ -16,7 +16,7 @@ __author__ = "xiaohesheng"
 """
 case_tag:api,spd_core1,a_c1流程十八中心库业务_拆包功能,id2302,id2302-21,sit,on
 核心业务流:a_c1流程十八中心库业务_拆包功能
-python runner_test.py tag id2302-20 debug mdm3
+python runner_test.py tag id2302-21 debug mdm3
 """
 
 
@@ -47,9 +47,8 @@ def center_Stock_unpack(type):  # 扫码发放(高值不能扫码发放)
         token, projectCode, uxid, corpId, info = login(username, password, 2)
         # 登录获取用户id等信息，使用创建的用户登录============结束
         # 到库房明细查询，查询产品的udi码
-        udi_code=get_udi1(1)
-        #扫码====================
-        # 退货出库扫条码
+        udi_code = get_udi1(1)
+        # 扫码====================
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                                  "herpService_stock_pick_scan_url")
         # 从message18文件中获取信息
@@ -67,75 +66,79 @@ def center_Stock_unpack(type):  # 扫码发放(高值不能扫码发放)
 
         request_body = commonFuc().get_business_data(module, "payload67", udi_code, stockId, stockName, areaCode,
                                                      areaName
-                                                    )
+                                                     )
         print('request_body', request_body)
         result = commonFuc().http_post(url, request_body, headers)
         print('扫码发放result', result)
-        #扫码=======================
+        price = commonFuc().analysis_json('price', commonFuc().analysis_json('data', result))
+        createTime = commonFuc().analysis_json('createTime', commonFuc().analysis_json('data', result))
+        hosId = commonFuc().analysis_json('hosId', commonFuc().analysis_json('data', result))
+        tbStatus = commonFuc().analysis_json('tbStatus', commonFuc().analysis_json('data', result))
+        printNum = commonFuc().analysis_json('printNum', commonFuc().analysis_json('data', result))
+        # 扫码=======================
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_centCbSubmit_url")
         print('url', url)
         headers = commonFuc().get_business_data(module, "json_headers2",
                                                 commonFuc().get_business_data(module, "json_contentType"), token,
                                                 commonFuc().get_business_data(module, "X-APP-CODE"))
+
         # 从文件中获取必要信息
         info = FileUtils().r_info8(module, "条码信息", 'message18')
         # print('info', info)
         list_a = info['list_a']
         # print('list_a', list_a[0], type(list_a), len(list_a))
         UTid = 'UT'
-        areaCode = 'areaCode';
-        createTime = 'createTime';
-        hosId = 'hosId';
-        stockId = 'stockId';
-        areaCode = 'areaCode';
-        areaName = 'areaName';
+        areaCode = 'areaCode'
+        # createTime = 'createTime'
+        hosId = 'hosId'
+        stockId = 'stockId'
+        areaCode = 'areaCode'
+        areaName = 'areaName'
         shelfCode = 'shelfCode'
-        codeType = 'codeType';
-        tagType = 'tagType';
-        hosGoodsId = 'hosGoodsId';
-        mdmGoodsCode = 'mdmGoodsCode';
-        goodsCode = 'goodsCode';
-        goodsDi = 'goodsDi';
-        barName = 'barName';
+        codeType = 'codeType'
+        tagType = 'tagType'
+        hosGoodsId = 'hosGoodsId'
+        mdmGoodsCode = 'mdmGoodsCode'
+        goodsCode = 'goodsCode'
+        goodsDi = 'goodsDi'
+        barName = 'barName'
         batchCode = 'batchCode'
-        expdtDate = 'expdtDate';
+        expdtDate = 'expdtDate'
         productDate = 'productDate'
         pkgCode = 'pkgCode'
-        print('aaaaaaaaaaaaaaaaaaaaaaaaa', list_a[0])
-        list_b = list_a[0]
-        for i in list_b:
+        for i in list_a:
             print(i)
             UTid = i['id']
             areaCode = i['areaCode']
-            createTime = i['createTime']
-            hosId = i['hosId']
-            stockId = i['stockId'];
-            areaCode = i['areaCode'];
-            areaName = i['areaName'];
+            # createTime = i['createTime']
+            # hosId = i['hosId']
+            stockId = i['stockId']
+            areaCode = i['areaCode']
+            areaName = i['areaName']
             shelfCode = i['shelfCode']
-            codeType = i['codeType'];
-            tagType = i['tagType'];
-            hosGoodsId = i['hosGoodsId'];
-            mdmGoodsCode = i['mdmGoodsCode']
-            goodsCode = i['goodsCode'];
-            goodsDi = i['goodsDi'];
-            barName = i['barName'];
+            codeType = i['codeType']
+            # tagType = i['tagType']
+            hosGoodsId = i['hosGoodsId']
+            # mdmGoodsCode = i['mdmGoodsCode']
+            goodsCode = i['goodsCode']
+            # goodsDi = i['goodsDi']
+            barName = i['barName']
             batchCode = i['batchCode']
-            expdtDate = i['expdtDate'];
+            expdtDate = i['expdtDate']
             productDate = i['productDate']
-            pkgCode = i['pkgCode']
+            # pkgCode = i['pkgCode']
             pkgCodeSee = i['pkgCodeSee']
             ssccCode = i['ssccCode']
-            tbStatus = i['tbStatus']
+            # tbStatus = i['tbStatus']
             onlyKey = i['hosGoodsId']
-            ext = i['ext']
+            ext = i['extInfo']
             print('ext', ext)
-            distrDetailId = ext['distrDetailId']
-            distrBillId = ext['distrBillId']
-            purBillId = ext['purBillId']
-            pkgDefQty = ext['pkgDefQty']
-            pkgDefId = ext['pkgDefId']
-            pkgDefName = ext['pkgDefName']
+            distrDetailId = reGetString(ext, r'distrDetailId": "', r'", ')
+            distrBillId = reGetString(ext, r'distrBillId": "', r'", ')
+            purBillId = reGetString(ext, r'purBillId": "', r'", ')
+            pkgDefQty = reGetString(ext, r'pkgDefQty": "', r'", ')
+            pkgDefId = reGetString(ext, r'pkgDefId": "', r'", ')
+            pkgDefName = reGetString(ext, r'pkgDefName": "', r'", ')
             purMode = i['purMode']
             goodsMfrsName = i['goodsMfrsName']
             goodsSpec = i['goodsSpec']
@@ -144,35 +147,38 @@ def center_Stock_unpack(type):  # 扫码发放(高值不能扫码发放)
             pkgDefId = i['pkgDefId']
             pkgDefQty = i['pkgDefQty']
             pkgDefName = i['pkgDefName']
-            printNum = i['printNum']
+            # printNum = i['printNum']
             made = i['made']
-            provId = i['provId']
-            provName = i['provName']
-            subProvId = i['subProvId']
-            subProvName = i['subProvName']
+            # provId = i['provId']
+            # provName = i['provName']
+            # subProvId = i['subProvId']
+            # subProvName = i['subProvName']
             hosGoodsCode = i['hosGoodsCode']
-            subSendFlag = i['subSendFlag']
+            # subSendFlag = i['subSendFlag']
             areaName = i['areaName']
-            hosId = i['hosId']
+            # hosId = i['hosId']
+            unitName = i['unitName']
+            purModeText = i['purModeText']
+            extInfo = i['extInfo']
+            inStockTime = reGetString(extInfo, r'inStockTime": "', r'",')
             break
         deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"]
         deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid1"]
         # # 请求体
-        request_body = commonFuc().get_business_data(module, "payload68", areaCode, UTid, createTime, UTid, hosId,
+        request_body = commonFuc().get_business_data(module, "payload68", stockId, stockName, areaCode, areaName, UTid,
+                                                     createTime, UTid, hosId,
                                                      stockId,
                                                      areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
                                                      mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
-                                                     productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus,
-                                                     distrDetailId,
-                                                     distrBillId, purBillId, pkgDefQty, pkgDefId, pkgDefName, purMode,
+                                                     productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus, pkgDefId,
+                                                     pkgDefQty,
+                                                     purBillId, pkgDefName, distrBillId, inStockTime,distrDetailId,
+                                                     purMode, price,
                                                      goodsMfrsName, goodsSpec, unit, goodsName, pkgDefId, pkgDefQty,
-                                                     pkgDefName, printNum, made, provId, provName, subProvId,
-                                                     subProvName,
-                                                     hosGoodsCode, subSendFlag, onlyKey, areaName, hosId,
-                                                     get_branch_id(),
-                                                     deptid1, deptName, stockId)
+                                                     pkgDefName, printNum, made, unitName, hosGoodsCode, purModeText)
         print('request_body', 'ccccccc', request_body)
-
+        import pdb
+        pdb.set_trace()
         # # # # 发送请求
         result = commonFuc().http_post(url, request_body, headers)
         print('result', result)
@@ -219,7 +225,7 @@ def center_Stock_unpack(type):  # 扫码发放(高值不能扫码发放)
         sourceId = ' '.join(PICK_ID)
         # 请求体
         request_body = commonFuc().get_business_data(module, "payload21", UT_id, createTime, snCode, hosId, stockId,
-                                                     areaCode, areaName, shelfCode, codeType, tagType, hosGoodsId,
+                                                     areaCode, areaName, shelfCode, codeType, hosGoodsId,
                                                      mdmGoodsCode, goodsCode, goodsDi, barName, batchCode, expdtDate,
                                                      productDate, pkgCode, pkgCodeSee, ssccCode, tbStatus,
                                                      distrDetailId,
@@ -316,7 +322,7 @@ def center_Stock_unpack(type):  # 扫码发放(高值不能扫码发放)
             pkgDefId = i['pkgDefId']
             pkgDefQty = i['pkgDefQty']
             pkgDefName = i['pkgDefName']
-            printNum = i['printNum']
+            # printNum = i['printNum']
             made = i['made']
             provId = i['provId']
             provName = i['provName']
@@ -404,10 +410,11 @@ def center_Stock_unpack(type):  # 扫码发放(高值不能扫码发放)
         print('herpService_stock_review_pass_submit_urlresult', result)
         # ========出库复核提交
 
+
 try:
     updateUserLoginDefaultRange(get_listUserMgrRangePage1(1))  # 设置登录账号默认权限是二级库
-    center_Stock_unpack(1) #低值耗材退货出库
-    center_Stock_unpack(2) #试剂耗材退货出库
+    center_Stock_unpack(1)  # 低值耗材退货出库
+    center_Stock_unpack(2)  # 试剂耗材退货出库
     commonFuc().check_text_exist_result_text('succees', 'succees')
 except:
     commonFuc().check_text_exist_result_text('error', '1')

data/b5_spd3_core_business_flow/data

@@ -319,121 +319,121 @@ json_headers2: {
     "remark": "",
     "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": "%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": {
-                "pkgDefQty": "%s",
-                "purBillId": "%s",
-                "distrBillId": "%s",
-                "inStockTime": "%s",
-                "useFrequency": 1,
-                "distrDetailId": "%s",
-                "certificateCode": "",
-                "multiChargeFlag": 0
-            },
-            "sourceDetailId": null,
-            "purMode": "%s",
-            "purModes": null,
-            "price": null,
-            "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": "%s",
-            "deptId": null,
-            "deptName": null,
-            "billId": null,
-            "taskId": null,
-            "made": "%s",
-            "provId": "%s",
-            "provName": "%s",
-            "subProvId": "%s",
-            "subProvName": "%s",
-            "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,
-            "hosBatchId": null,
-            "settleFlag": null,
-            "inStockTime": null,
-            "subSendFlag": "%s",
-            "onlyKey": "%s"
+"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": {
+"pkgDefQty": "%s",
+"purBillId": "%s",
+"distrBillId": "%s",
+"inStockTime": "%s",
+"useFrequency": 1,
+"distrDetailId": "%s",
+"certificateCode": "",
+"multiChargeFlag": 0
+},
+"sourceDetailId": null,
+"purMode": "%s",
+"purModes": null,
+"price": null,
+"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": "%s",
+"deptId": null,
+"deptName": null,
+"billId": null,
+"taskId": null,
+"made": "%s",
+"provId": "%s",
+"provName": "%s",
+"subProvId": "%s",
+"subProvName": "%s",
+"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,
+"hosBatchId": null,
+"settleFlag": null,
+"inStockTime": null,
+"subSendFlag": "%s",
+"onlyKey": "%s"
         }
     ],
     "areaName": "%s",
@@ -445,6 +445,84 @@ json_headers2: {
     "pickType": "TH"
 }
 "payload67": {"pickType":"CB","tbStatus":20,"code":"%s","stockId":"%s","stockName":"%s","areaCode":"%s","areaName":"%s","ignoreValidExpDate":false}
-"payload68": {"stockId":"d7e35cf14e9c4a89aa6befa525497649","stockName":"东土城路院区!(BYi中心库房","areaCode":"areah03472488","areaName":"自动化测试","barCodeList":[{"id":"UT240626001004","lastModified":null,"version":null,"createTime":"2024-06-26 13:46:39","createUser":null,"lastModifiedUser":null,"snCode":"UT240626001004","hosId":"h0347","branchId":null,"stockId":"d7e35cf14e9c4a89aa6befa525497649","areaCode":"areah03472488","areaName":"自动化测试","shelfCode":"areah03472488-2-01-01","codeType":16,"tagType":0,"hosGoodsId":"h034700004280","mdmGoodsCode":"11661228","goodsCode":"00004280","goodsDi":"37010000042800","barName":"100支/100","batchCode":"333","expdtDate":"2025-01-02","productDate":"2024-06-26","mfrCode":null,"mfrCodeSee":null,"pkgCode":"013701000004280010333\u001d112406261725010221UT240626001004","pkgCodeSee":"013701000004280010333112406261725010221UT240626001004","ssccCode":"010839000185786327","extInfo":null,"outId":null,"tbStatus":20,"goodsCodeDi":null,"barcodeId":null,"ext":{"pkgDefId":"9affbca4b6bc42bb9603239a4f47748d","pkgDefQty":100,"purBillId":"CG2024062619741","pkgDefName":"100","distrBillId":"PSh0347202406260019","inStockTime":"2024-06-26 13:55:46","distrDetailId":"03838870","certificateCode":""},"sourceDetailId":null,"purMode":10,"purModes":null,"price":99.9999,"pid":null,"goodsMfrsName":"德国歌德公司 Geuder AG","mfrsName":null,"goodsSpec":"G-31891","unit":"支","goodsName":"一次性注射器_低值#c!$C","pkgDefId":"9affbca4b6bc42bb9603239a4f47748d","pkgDefQty":100,"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":"100支/100","areaCodeList":null,"diType":null,"mdmGoodsSpecCode":null,"hosGoodsCode":"00004280","supplyId":null,"inSettlement":null,"spdGoodsCode":null,"codeKind":null,"brand":null,"miCode":"","transferRatio":1,"miDjmc":"","tbStatusList":null,"purModeText":"低值耗材","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}],"pickType":"CB","tbStatus":20}
+"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
+        }
+    ],
+    "pickType": "CB",
+    "tbStatus": 20
+}
 "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: PSh0347202406280006
-  distrBillId2: PSh0347202406280006
+  distrBillId1: PSh0347202406280018
+  distrBillId2: PSh0347202406280018
 高值配送单号:
-  distrBillId1: PSh0347202406280007
-  distrBillId2: PSh0347202406280007
+  distrBillId1: PSh0347202406280019
+  distrBillId2: PSh0347202406280019
 试剂配送单号:
-  distrBillId1: PSh0347202406280008
-  distrBillId2: PSh0347202406280008
+  distrBillId1: PSh0347202406280020
+  distrBillId2: PSh0347202406280020

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024062830339
-  orderNo2: PLAN2024062830339
+  orderNo1: PLAN2024062830378
+  orderNo2: PLAN2024062830378

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024062830340
-  orderNo2: PLAN2024062830340
+  orderNo1: PLAN2024062830379
+  orderNo2: PLAN2024062830379

data/b5_spd3_core_business_flow/message13

@@ -3,32 +3,32 @@
   - &id001
     - id:
       hosId: h0347
-      branchId: h0347-3701
+      branchId: h0347-3703
       deptId:
       taskType: 1
-      sourceOrgId: p1e2d0
-      sourceOrgName: 国药集团公司EJey4
-      sourceOrderNo: PSh0347202406260037
+      sourceOrgId: p1e2d6
+      sourceOrgName: 国药集团公司HcKed
+      sourceOrderNo: PSh0347202406280020
       billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202406260037
+      sourceId: PSh0347202406280020
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024062630186
-      purOrderNo: CG2024062619774
-      recOrgId: a164fd08a56b448d978c2e48dabc64f6
-      recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024062600015","planBillId":"Ph034720240626026831","planOrderNo":"PLAN2024062630186","buyOrderNo":"BUY2024062605317","purOrderNo":"CG2024062619774","purBillId":"Ch034720240626000087","purBillDate":"2024-06-26
-        14:18:26","distrBillId":"PSh0347202406260037","distrOrderNo":"PSh0347202406260037"}'
-      taskDate: '2024-06-26 14:18:50'
+      planOrderNo: PLAN2024062830379
+      purOrderNo: CG2024062819898
+      recOrgId: f72c2b5cf1e74269bbea7fb380eb229c
+      recOrgName: 设备科001
+      billRelationJson: '{"planBillId":"Ph034720240628027024","planOrderNo":"PLAN2024062830379","purOrderNo":"CG2024062819898","purBillId":"Ch034720240628000091","purBillDate":"2024-06-28
+        09:00:58","distrBillId":"PSh0347202406280020","distrOrderNo":"PSh0347202406280020"}'
+      taskDate: '2024-06-28 09:01:14'
       taskDateStart:
       taskDateEnd:
       billModeList:
       viewIdList:
-      supplierFlag: true
+      supplierFlag: false
       tbStatus: 20
       remark: ''
       pdaFlag:

data/b5_spd3_core_business_flow/message14

@@ -3,11 +3,11 @@
   - &id001
     - purMode: 60
       unitName: 100支/100
-      hosGoodsId: h034700004281
+      hosGoodsId: h034700004300
       mdmGoodsCode:
-      spdGoodsCode: '11661229'
-      goodsCode: '00004281'
-      goodsName: 新型冠状病毒检测试剂4GWk!
+      spdGoodsCode: '11661253'
+      goodsCode: '00004300'
+      goodsName: 新型冠状病毒检测试剂NB9uU
       goodsGg: G-31891
       mfrsId:
       mfrsName: 德国歌德公司 Geuder AG
@@ -22,21 +22,21 @@
       pkgDefName: '100'
       pkgDefQty: 100.0
       batchCode: '4444'
-      expdtDate: '2025-01-02'
-      productDate: '2024-06-26'
-      provName: 国药集团公司EJey4
+      expdtDate: '2025-01-04'
+      productDate: '2024-06-28'
+      provName: 国药集团公司HcKed
       provId:
-      viewId: '03838888'
+      viewId: '03838924'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03838888'
+      id: '03838924'
       detailRelationJson:
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004281","purMode":60,"goodsName":"新型冠状病毒检测试剂4GWk!","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661229","ybDefId":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004300","purMode":60,"goodsName":"新型冠状病毒检测试剂NB9uU","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661253","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:
       limitMessage:
   list_b:
   - *id001

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024062600115
-  CHECK_NO2: CHECKh03472024062600115
+  CHECK_NO1: CHECKh03472024062800004
+  CHECK_NO2: CHECKh03472024062800004

data/b5_spd3_core_business_flow/message16

@@ -5,34 +5,34 @@
       lastModified:
       version:
       createTime:
-      createUser: h0347_UID-051365
+      createUser: h0347_UID-051368
       lastModifiedUser:
       billMode: '16'
       recType:
       stockKind:
       purMode:
-      sourceId: CHECKh03472024062600102
+      sourceId: CHECKh03472024062800002
       sourceType: PSD
       sourceVersion: 0
       batchList:
       billRelationJson:
       hosId: h0347
-      deptId: f94c7beab2524e1eb14aa161d1feac8a
+      deptId: f72c2b5cf1e74269bbea7fb380eb229c
       deptName:
-      branchId: h0347-3701
+      branchId: h0347-3703
       branchName:
       taskType: 1
-      sourceOrgId: p1e2d0
-      sourceOrgName: 国药集团公司EJey4
-      sourceOrderNo: YS240626102
-      taskSourceNo: PSh0347202406260019
-      areaCode: areah03472488
+      sourceOrgId: p1e2d6
+      sourceOrgName: 国药集团公司HcKed
+      sourceOrderNo: YS240628002
+      taskSourceNo: PSh0347202406280012
+      areaCode: areah03472500
       areaName: 自动化测试
       goodsName:
       goodsGg:
       startDate:
       endDate:
-      taskDate: '2024-06-26 13:48:29'
+      taskDate: '2024-06-28 08:56:19'
       pkgTaskId:
       pkgFlag:
       remark: ''

data/b5_spd3_core_business_flow/message17

 验收单库存详情信息:
   list_a:
   - &id001
-    - id: CHECKh034720240626001020001
+    - id: CHECKh034720240628000020001
       lastModified:
       version:
       createTime:
@@ -10,27 +10,27 @@
       rowIdx:
       purMode: 10
       unitName: 100支/100
-      pid: CHECKh03472024062600102
-      hosGoodsId: h034700004280
+      pid: CHECKh03472024062800002
+      hosGoodsId: h034700004299
       batchCode: '333'
-      expdtDate: '2025-01-02'
-      productDate: '2024-06-26'
+      expdtDate: '2025-01-04'
+      productDate: '2024-06-28'
       batchPrice: 99.9999
       settlement: 1
       batchType: 20
-      srcBatchId: '03838870'
+      srcBatchId: '03838916'
       srcBatchPrice: 99.9999
-      shelfCode: areah03472488-2-01-01
+      shelfCode: areah03472500-2-01-01
       shelfKind:
-      barcodeId: UT240626001001
+      barcodeId: UT240628000601
       subBarcodeId:
       qty: 10000.0
       pkgQty: 100
-      distrId: PSh0347202406260019
-      distrDetailId: '03838870'
+      distrId: PSh0347202406280012
+      distrDetailId: '03838916'
       pkgDefQty: 100.0
       pkgDefName: '100'
-      viewId: h0347000042803332025-01-02100支/100
+      viewId: h0347000042993332025-01-04100支/100
       codingType:
       batchFlag:
       hasSterilize: 0
@@ -38,31 +38,31 @@
       sterilizePassQty:
       sterilizeRejectQty:
       orderNo:
-      sourceDetailId: '03838870'
-      mdmGoodsCode: '11661228'
-      goodsCode: '00004280'
+      sourceDetailId: '03838916'
+      mdmGoodsCode: '11661252'
+      goodsCode: '00004299'
       tbStatus: 1
       billMode: '16'
       hosId: h0347
-      branchId: h0347-3701
-      purBillId: Ch034720240626000054
-      provId: p1e2d0
-      provName: 国药集团公司EJey4
+      branchId: h0347-3703
+      purBillId: Ch034720240628000065
+      provId: p1e2d6
+      provName: 国药集团公司HcKed
       subSendFlag: 10
-      exeProvId: p1e2d0
-      exeProvName: 国药集团公司EJey4
-      purDetailId: 5fa29fb5d2744fb5849dd21cdb891f10
-      goodsName: 一次性注射器_低值#c!$C
+      exeProvId: p1e2d6
+      exeProvName: 国药集团公司HcKed
+      purDetailId: b48e9d30e2554aaf8522e791fbcf83c8
+      goodsName: 一次性注射器_低值aK%^J
       goodsGg: G-31891
       mfrsId: mfrs-11229
       mfrsName: 德国歌德公司 Geuder AG
       made: 德国
       unit: 支
       purPrice: 99.9999
-      pkgDefId: 9affbca4b6bc42bb9603239a4f47748d
-      supplyId: b73baa3ec3634d088e6009b198757be1
-      subProvId: p1e2d0
-      subProvName: 国药集团公司EJey4
+      pkgDefId: 86c1768645fd4eb298f14e2c9cbdbb91
+      supplyId: fa0a1127a3674fb3b972d41d0832dc9d
+      subProvId: p1e2d6
+      subProvName: 国药集团公司HcKed
       subPrice: 99.9999
       distrPrice: 99.9999
       distrPkgQty: 100.0
@@ -74,13 +74,13 @@
       psiPrice: 99.9999
       ext:
         goodsGg: G-31891
-        goodsCode: '00004280'
+        goodsCode: '00004299'
         purMode: 10
-        goodsName: 一次性注射器_低值#c!$C
+        goodsName: 一次性注射器_低值aK%^J
         ygptCode: ''
         transCond: ''
         storageCond: ''
-        erpCode: '11661228'
+        erpCode: '11661252'
         ybDefId: ''
       purTaskId:
       multiChargeFlag:

data/b5_spd3_core_business_flow/message18

 条码信息:
   list_a:
   - &id001
-    id: UT240626001602
-    snCode: UT240626001602
-    ssccCode: '010839000185876325'
-    pkgCodeSee: 0137010000042810104444112406261725010221UT240626001602
-    hosGoodsId: h034700004281
-    hosGoodsCode: '00004281'
-    goodsCode: '00004281'
-    goodsName: 新型冠状病毒检测试剂4GWk!
+    id: UT240628000602
+    snCode: UT240628000602
+    ssccCode: '010839000185971624'
+    pkgCodeSee: 013703000004299010333112406281725010421UT240628000602
+    hosGoodsId: h034700004299
+    hosGoodsCode: '00004299'
+    goodsCode: '00004299'
+    goodsName: 一次性注射器_低值aK%^J
     goodsSpec: G-31891
     goodsMfrsName: 德国歌德公司 Geuder AG
     unit: 支
-    purMode: 60
-    batchCode: '4444'
-    productDate: '2024-06-26'
-    expdtDate: '2025-01-02'
+    purMode: 10
+    batchCode: '333'
+    productDate: '2024-06-28'
+    expdtDate: '2025-01-04'
     pkgDefName: '100'
     pkgDefQty: 100.0
-    stockId: a5e9d4db55ca4fd482ce2a8f50d5d006
-    stockName: 三级检测组003库房
-    areaName: 默认库区
-    areaCode: areah03472485
+    stockId: dbb450112aac4cadbd23d9f3a1d25bf0
+    stockName: 东土城路院区O!1FP中心库房
+    areaName: 自动化测试
+    areaCode: areah03472500
     lockStatus: 0
     unitName: 100支/100
-    shelfCode: areah03472485-A-01-01
-    shelfNo: A01-A-01-01
-    pkgDefId: d2e7b571331e43368ffe9bd7f4d2e772
-    extInfo: '{"pkgDefId": "d2e7b571331e43368ffe9bd7f4d2e772", "pkgDefQty": 100, "purBillId":
-      "CG2024062619768", "pkgDefName": "100", "distrBillId": "PSh0347202406260031",
-      "inStockTime": "2024-06-26 14:26:36", "distrDetailId": "03838882", "certificateCode":
+    shelfCode: areah03472500-2-01-01
+    shelfNo: 自动化测试-2-01-01
+    pkgDefId: 86c1768645fd4eb298f14e2c9cbdbb91
+    extInfo: '{"pkgDefId": "86c1768645fd4eb298f14e2c9cbdbb91", "pkgDefQty": 100, "purBillId":
+      "CG2024062819872", "pkgDefName": "100", "distrBillId": "PSh0347202406280012",
+      "inStockTime": "2024-06-28 09:02:41", "distrDetailId": "03838916", "certificateCode":
       ""}'
     bottleId:
-    pkgType: '66'
+    pkgType: '16'
     miDjmc: ''
     miCode: ''
     transferRatio: 1.0
     qty: 1
     shelfKind: 0
     shelfKindName: 普通货位
-    provName: 国药集团公司EJey4
-    provId: p1e2d0
-    inStockDate: '2024-06-26 14:26:35'
+    provName: 国药集团公司HcKed
+    provId: p1e2d6
+    inStockDate:
     mfrCode:
     made: 德国
     price:
     barName: 100支/100
-    purModeText: 检验试剂
-    codeType: 66
+    purModeText: 低值耗材
+    codeType: 16
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message7

 采购计划单号:
-  orderNo1: PLAN2024062830338
-  orderNo2: PLAN2024062830338
+  orderNo1: PLAN2024062830377
+  orderNo2: PLAN2024062830377

data/b5_spd3_core_business_flow/message8

 配送订单信息:
   list_a:
   - &id001
-    - id: Ch034720240628000052
-      lastModified: '2024-06-28 07:09:33'
+    - id: Ch034720240628000091
+      lastModified: '2024-06-28 09:00:58'
       version: 0
-      createTime: '2024-06-28 07:09:33'
+      createTime: '2024-06-28 09:00:58'
       createUser: h0347_UID-051368
       lastModifiedUser:
-      orderNo: CG2024062819859
+      orderNo: CG2024062819898
       billMode: '66'
       recType: YND
       hosId: h0347
@@ -19,7 +19,7 @@
       areaCode:
       areaName:
       billExpdtDate:
-      sourceId: Ph034720240628026985
+      sourceId: Ph034720240628027024
       sourceType:
       inSettlement:
       recUser:
@@ -47,7 +47,7 @@
       sumQty: 10000.0
       sumPkgQty: 100.0
       sumAmount: '999999.0000'
-      planOrderNo: PLAN2024062830340
+      planOrderNo: PLAN2024062830379
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message9

 配送订单详细信息:
   list_a:
   - &id001
-    - id: ba664a9f0c3a4cb197b1bf39e11c67fe
+    - id: d6982898b95341958c634d60a83de245
       lastModified:
       version:
       createTime:
       createUser:
       lastModifiedUser:
-      pid: Ch034720240628000052
-      orderNo: CG2024062819859
-      sourceId: 11e8e725a92a43299eec2c501a9aab68
+      pid: Ch034720240628000091
+      orderNo: CG2024062819898
+      sourceId: b39232b5e5304394a619893ceb50707a
       hosGoodsId: h034700004300
       mdmGoodsCode: '11661253'
       goodsCode: '00004300'
@@ -31,7 +31,7 @@
       notSendPkgQty: 0.0
       inSettlement: 1
       closeType: 1
-      detailRelationJson: '{"planBillId":"Ph034720240628026985","planDetailId":"11e8e725a92a43299eec2c501a9aab68"}'
+      detailRelationJson: '{"planBillId":"Ph034720240628027024","planDetailId":"b39232b5e5304394a619893ceb50707a"}'
       extInfo: '{"goodsGg":"G-31891","goodsCode":"00004300","purMode":60,"goodsName":"新型冠状病毒检测试剂NB9uU"}'
       remark:
       tbStatus:

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'>0</td>
-            <td class='details-col-elapsed'>1分0秒</td>
+            <td class='details-col-elapsed'>6分0秒</td>
             <td class="details-col-elapsed">0.0%</td>
         </tr>
     </table>
@@ -93,9 +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/a_c1流程十八中心库业务_拆包功能/log.html' target='_blank'>a_c1流程十八中心库业务_拆包功能</a></td>
             <td class="fail">失败</td>
-            <td class="details-col-elapsed">60.155</td>
+            <td class="details-col-elapsed">360.493</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>