diff --git a/common/db/sql/sql_del_branch_info.py b/common/db/sql/sql_del_branch_info.py index 1d95aed9f766bbf12c1e68f2940f7ebeff21f531..642f25745f377deca71ee54079b3561e9abf406b 100644 --- a/common/db/sql/sql_del_branch_info.py +++ b/common/db/sql/sql_del_branch_info.py @@ -621,7 +621,7 @@ class delData(object): #删除院区产品表和部门产品表多余的数据 sql1 = "delete from mcms_branch_goods_info where hos_goods_id not in(select id from mcms_goods_info);" sql2 = "delete from mcms_branch_goods_info where branch_id not in(%s);" % branch_id - sql3 = "delete mcms_dept_goods_info where hos_goods_id not in(select id from mcms_goods_info);" + sql3 = "delete from mcms_dept_goods_info where hos_goods_id not in(select id from mcms_goods_info);" sql4 = "delete from mcms_dept_goods_info where branch_id not in(%s);"%branch_id cursor.execute(sql1) cursor.execute(sql2) @@ -801,3 +801,4 @@ class delData(object): # delData().Delete_business_Data_All() # delData().Delete_business_Data_All2() # delData().check_goods_info() +delData().Delete_business_Data_All() \ No newline at end of file diff --git a/data/b5_spd3_core_business_flow/message11 b/data/b5_spd3_core_business_flow/message11 index 8939fabcd530df46755d4723cc36c74e61028090..256a1d7471b05a69136c40a3d6d1a845431fe4f5 100644 --- a/data/b5_spd3_core_business_flow/message11 +++ b/data/b5_spd3_core_business_flow/message11 @@ -1,3 +1,3 @@ 采购计划单号高值: - orderNo1: PLAN2024070230930 - orderNo2: PLAN2024070230930 + orderNo1: PLAN2024070230933 + orderNo2: PLAN2024070230933 diff --git a/data/b5_spd3_core_business_flow/message18 b/data/b5_spd3_core_business_flow/message18 index 370ec3357238542d8c481aee8886b3daf31394a6..360c330a0d6e1294558663f8927a1a7922166aaa 100644 --- a/data/b5_spd3_core_business_flow/message18 +++ b/data/b5_spd3_core_business_flow/message18 @@ -1,119 +1,53 @@ 条码信息: list_a: - &id001 - - id: UT240702000204 - lastModified: - version: - createTime: '2024-07-02 11:05:19' - createUser: - lastModifiedUser: - snCode: UT240702000204 - hosId: h0347 - branchId: - stockId: fe0b489d59cd48d08960e5096a714487 - areaCode: areah03472553 - areaName: 自动化测试 - shelfCode: areah03472553-2-01-01 - codeType: 16 - tagType: 0 - hosGoodsId: h034700004353 - mdmGoodsCode: '11661306' - goodsCode: '00004353' - goodsDi: '37120000043530' - barName: 100支/100 - batchCode: '333' - expdtDate: '2025-01-08' - productDate: '2024-07-02' - mfrCode: - mfrCodeSee: - pkgCode: "013712000004353010333\x1D112407021725010821UT240702000204" - pkgCodeSee: 013712000004353010333112407021725010821UT240702000204 - ssccCode: '010839000186587824' - extInfo: - outId: - tbStatus: 20 - goodsCodeDi: - barcodeId: - ext: - pkgDefId: ee7fb81570664e758bd2642f4dab3ed3 - pkgDefQty: 100 - purBillId: CG2024070220251 - pkgDefName: '100' - distrBillId: PSh0347202407020009 - inStockTime: '2024-07-02 11:13:44' - distrDetailId: '03839046' - certificateCode: '' - sourceDetailId: - purMode: 10 - purModes: - price: - pid: - goodsMfrsName: 德国歌德公司 Geuder AG - mfrsName: - goodsSpec: G-31891 - unit: 支 - goodsName: 一次性注射器_低值NaZMe - pkgDefId: ee7fb81570664e758bd2642f4dab3ed3 - pkgDefQty: 100 - defaultPkgDefQty: - defaultQty: - defaultSurplusQty: - defaultPkgDefId: - purDetailId: - pkgDefName: '100' - printNum: 0 - deptId: - deptName: - billId: - taskId: - made: 德国 - provId: p1e2e8 - provName: 国药集团公司kGTpV - subProvId: p1e2e8 - subProvName: 国药集团公司kGTpV - provHosGoodsId: - sourceType: - taskDate: - sourceOrderNo: - taskType: - detailId: - branchGoodsPkgDefList: - unitName: - areaCodeList: - diType: - mdmGoodsSpecCode: - hosGoodsCode: '00004353' - supplyId: - inSettlement: - spdGoodsCode: - codeKind: - brand: - miCode: - transferRatio: 1.0 - miDjmc: - tbStatusList: - purModeText: - stockName: - tbStatusText: - pkgType: - bottleId: - pkgStatus: - qty: - packUnit: - minSaleQty: - rfidFlag: - mfrCodeFlag: - scanStatus: - scanId: - multiChargeFlag: - useFrequency: - chargeUnit: - lockStatus: - remark: - hosBatchId: - settleFlag: - inStockTime: - subSendFlag: 10 + id: UT240702000703 + snCode: UT240702000703 + ssccCode: '010839000186667724' + pkgCodeSee: 0137120000043540104444112407021725010821UT240702000703 + hosGoodsId: h034700004354 + hosGoodsCode: '00004354' + goodsCode: '00004354' + goodsName: 新型冠状病毒检测试剂j(r&Q + goodsSpec: G-31891 + goodsMfrsName: 德国歌德公司 Geuder AG + unit: 支 + purMode: 60 + batchCode: '4444' + productDate: '2024-07-02' + expdtDate: '2025-01-08' + pkgDefName: '100' + pkgDefQty: 100.0 + stockId: fe0b489d59cd48d08960e5096a714487 + stockName: 东土城路院区$!ZNd中心库房 + areaName: 自动化测试 + areaCode: areah03472553 + lockStatus: 0 + unitName: 100支/100 + shelfCode: areah03472553-2-01-01 + shelfNo: 自动化测试-2-01-01 + pkgDefId: 96c4ca2199a14150a1cdabff56136aaf + extInfo: '{"pkgDefId": "96c4ca2199a14150a1cdabff56136aaf", "pkgDefQty": 100, "purBillId": + "CG2024070220277", "pkgDefName": "100", "distrBillId": "PSh0347202407020017", + "inStockTime": "2024-07-02 11:13:19", "distrDetailId": "03839054", "certificateCode": + ""}' + bottleId: + pkgType: '66' + miDjmc: '' + miCode: '' + transferRatio: 1.0 + qty: 1 + shelfKind: 0 + shelfKindName: 普通货位 + provName: 国药集团公司kGTpV + provId: p1e2e8 + inStockDate: + mfrCode: + made: 德国 + price: + barName: 100支/100 + purModeText: 检验试剂 + codeType: 66 list_b: - *id001 list_c: diff --git a/data/b5_spd3_core_business_flow/message21 b/data/b5_spd3_core_business_flow/message21 index 4255f632bc724a774da3522e9ffe92515c6ac923..62ae711560c69512d3deb4a363b433c98f608b3c 100644 --- a/data/b5_spd3_core_business_flow/message21 +++ b/data/b5_spd3_core_business_flow/message21 @@ -1,14 +1,14 @@ 二级库请领产品信息: list_a: - &id001 - - hosGoodsId: h034700004353 - purMode: 10 + - hosGoodsId: h034700004354 + purMode: 60 grantRule: id: - goodsName: 一次性注射器_低值NaZMe + goodsName: 新型冠状病毒检测试剂j(r&Q goodsSpec: G-31891 - mdmGoodsCode: '11661306' - goodsCode: '00004353' + mdmGoodsCode: '11661307' + goodsCode: '00004354' unit: 支 goodsMfrsName: 德国歌德公司 Geuder AG miDjmc: '' @@ -16,9 +16,9 @@ pkgDefName: '100' pkgDefQty: 100.0 pkgQty: - qty: 0 + qty: 100.0 goodsImg: [] - pkgDefId: ee7fb81570664e758bd2642f4dab3ed3 + pkgDefId: 96c4ca2199a14150a1cdabff56136aaf buyPkgQty: unitName: 100支/100 price: 99.9999 @@ -34,14 +34,14 @@ targetStockName: 东土城路院区$!ZNd中心库房 purchaseFlag: 1 tempFlag: 0 - grantWay: 1 + grantWay: 3 deptGoodsStatus: codingType: 0 - purModeText: 低值耗材 - goodsGeneralName: 一次性注射器 + purModeText: 检验试剂 + goodsGeneralName: 检测试剂 provName: 国药集团公司kGTpV - noRecPkgQty: 7.0 - noRecQty: 700.0 + noRecPkgQty: 8.0 + noRecQty: 800.0 autoUnpack: 0 consumeQty: consumePkgQty: diff --git a/report/summary.html b/report/summary.html index e8976a751bc65842a4aad51c6be2881b30a8d01b..26c1a6a2f6b178aad2b0aba0f4f392328665e61a 100644 --- a/report/summary.html +++ b/report/summary.html @@ -75,9 +75,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 - 1 + 9 0 - 3分34秒 + 14分10秒 0.0% @@ -93,9 +93,65 @@ setInterval(updateTime, 1000); // 每秒更新一次时间 - a_b2流程九请领业务流_二级库向中心库 + a_b3流程十请领业务流_二级库向边仓 失败 - 213.982 + 66.478 + xiaohesheng + + + + a_b4流程十一请领业务流_二级库向直送 + 失败 + 781.789 + xiaohesheng + + + + a_b5流程十二请领业务流_二级库向二级库 + 失败 + 1.043 + xiaohesheng + + + + a_b6流程十三请领业务流_三级库向二级库 + 失败 + 0.181 + xiaohesheng + + + + a_b7流程十四退库业务_消耗退库 + 失败 + 0.137 + xiaohesheng + + + + a_b8流程十五退库业务_三级库向二级库退库 + 失败 + 0.149 + xiaohesheng + + + + a_b9流程十六退库业务_二级库向一级库退库 + 失败 + 0.586 + xiaohesheng + + + + a_c0流程十七退货业务 中心库退供应商 + 失败 + 0.148 + xiaohesheng + + + + a_c1流程十八中心库业务_拆包功能 + 失败 + 0.153 xiaohesheng