流程十二脚本编写

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

@@ -20,8 +20,6 @@ python runner_test.py tag id2302-18 debug mdm3
 """
 
 
-
-
 def second_dept_return_Out_Stock(type):  # 三级库退库出库
     module = "b5_spd3_core_business_flow"
     # # 登录获取用户id等信息，使用创建的用户登录===========开始

air_case/b5_spd3_core_business_flow/a_b9流程十六退库业务_二级库向一级库退库.air/a_b9流程十六退库业务_二级库向一级库退库.py

@@ -428,6 +428,7 @@ def second_dept_return_Out_Stock(type):  # 二级库退库出库
 try:
     updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))  # 设置登录账号默认权限是三级库
     second_dept_return_Out_Stock(2)  #高值耗材退货出库
+    approval_center()
     # second_dept_return_Out_Stock(1) #低值耗材退货出库
     # second_dept_return_Out_Stock(3) #低值耗材退货出库
     # second_dept_one_key_in(2)

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202406120038
-  cname: 国药集团公司2u7a4
+  e_id: CR202406130038
+  cname: 国药集团公司K19@c

data/a3_mdm3_hs/message

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

data/a5_mdm3_pdm/message2

 产品审核信息:
-  MSPid: MSP2406120011_1
+  MSPid: MSP2406130011_1
   hosId: h0347
-  hosGoodsId: h034700004078
-  provGoodsid: provGood-99221265
-  goodsAuditBillId: MSP2406120011
-  targetId: MSP2406120011_1
+  hosGoodsId: h034700004093
+  provGoodsid: provGood-99221280
+  goodsAuditBillId: MSP2406130011
+  targetId: MSP2406130011_1

data/a6_mdm3_si/message

@@ -2,10 +2,10 @@
   list_a:
   - &id001
     settleMonth: '202406'
-    pid: OBh0347202406120004
-    hosGoodsId: h034700004075
-    goodsCode: '00004075'
-    goodsName: 一次性注射器_低值xaYjQ
+    pid: OBh0347202406130004
+    hosGoodsId: h034700004090
+    goodsCode: '00004090'
+    goodsName: 一次性注射器_低值6Vcb1
     goodsGg: G-31891
     mfrsName: 德国歌德公司 Geuder AG
     unit: 支
@@ -20,13 +20,13 @@
     normalContractId:
     normalContract: '1'
     detailList:
-    - pid: OBh0347202406120004
+    - pid: OBh0347202406130004
       settleMonth: '202406'
-      hosGoodsId: h034700004075
+      hosGoodsId: h034700004090
       batchCode: '333'
-      distrDetailId: '03838369'
-      distrId: PSh0347202406120005
-      distrOrderNo: PSh0347202406120005
+      distrDetailId: '03838410'
+      distrId: PSh0347202406130005
+      distrOrderNo: PSh0347202406130005
       settlePrice: 99.9999
       maxSettleQty: -100.0
       maxSettleAmount: -9999.99
@@ -35,11 +35,11 @@
       leftSettleQty: -100.0
       leftSettleAmount: -9999.99
       hosId: h0347
-      provId: p1e28e
-      branchId: h0347-3667
-      balanceDetId: OBh0347202406120004-000001
+      provId: p1e292
+      branchId: h0347-3669
+      balanceDetId: OBh0347202406130004-000001
       purMode: 10
-      barCode: 013667000004075010333112406121724121921UT240612000202
+      barCode: 013669000004090010333112406131724122021UT240613000202
       batchId:
       price:
       maxQty:
@@ -52,14 +52,14 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202406OBh0347202406120004h034700004075
-    - pid: OBh0347202406120004
+      viewId: 202406OBh0347202406130004h034700004090
+    - pid: OBh0347202406130004
       settleMonth: '202406'
-      hosGoodsId: h034700004075
+      hosGoodsId: h034700004090
       batchCode: '333'
-      distrDetailId: '03838369'
-      distrId: PSh0347202406120005
-      distrOrderNo: PSh0347202406120005
+      distrDetailId: '03838410'
+      distrId: PSh0347202406130005
+      distrOrderNo: PSh0347202406130005
       settlePrice: 99.9999
       maxSettleQty: 100.0
       maxSettleAmount: 9999.99
@@ -68,11 +68,11 @@
       leftSettleQty: 100.0
       leftSettleAmount: 9999.99
       hosId: h0347
-      provId: p1e28e
-      branchId: h0347-3667
-      balanceDetId: OBh0347202406120004-000002
+      provId: p1e292
+      branchId: h0347-3669
+      balanceDetId: OBh0347202406130004-000002
       purMode: 10
-      barCode: 013667000004075010333112406121724121921UT240612000286
+      barCode: 013669000004090010333112406131724122021UT240613000246
       batchId:
       price:
       maxQty:
@@ -85,10 +85,10 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202406OBh0347202406120004h034700004075
-    unique: 202406OBh0347202406120004h034700004075
+      viewId: 202406OBh0347202406130004h034700004090
+    unique: 202406OBh0347202406130004h034700004090
     onlineKind: '10'
-    viewId: 202406OBh0347202406120004h034700004075
+    viewId: 202406OBh0347202406130004h034700004090
   list_b:
   - *id001
   list_c:

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3667
-  branch_name: 东土城路院区!uON*
+  branch_id: h0347-3669
+  branch_name: 东土城路院区!NuM^
 科室信息:
-  dept2_id: a463883417d44685862ebc9eb9c62990
+  dept2_id: 7020cc82c12a46e0a8ca998a00bf6760
   dept2_name: 二级检验科002

data/b2_herp3_bs/message3

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

data/b2_herp3_bs/message4

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

data/b2_herp3_bs/message5

 部门和库区信息:
-  dept1_id: 42d415ddd37444858d61aa923d936b16
-  stockAreaId: 024aedc366c34170bc51f39512b20212
+  dept1_id: e65c6628c20e4c9cb6f4beacd41cd390
+  stockAreaId: ed6381c144814addbc358c196f11a80d

data/b2_herp3_bs/message6

 所有科室id:
-  deptid1: 42d415ddd37444858d61aa923d936b16
-  deptid2: a463883417d44685862ebc9eb9c62990
-  deptid3: f7dc795546bf4722982f8b7c5632e83f
-  deptid4: 590524f6ba7c4daea481ef39df0b3517
-  deptid5: 8cb36be87c864daeb3499d5f6f781fb3
+  deptid1: e65c6628c20e4c9cb6f4beacd41cd390
+  deptid2: 7020cc82c12a46e0a8ca998a00bf6760
+  deptid3: 3356dc58500e40bd9b9b536567f12488
+  deptid4: 6e5d85651a1c4826bae24053a770b01d
+  deptid5: eba07a9680434e60a94f2568bb696772
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002

data/b2_herp3_bs/message7

 shelfinfo:
-  shelfid: 024aedc366c34170bc51f39512b20212
-  shelfCode: areah03472291
+  shelfid: ed6381c144814addbc358c196f11a80d
+  shelfCode: areah03472305
   areaName: 自动化测试

data/b3_herp3_purchase/data

@@ -93,10 +93,10 @@ json_headers2: {
 "payload_2_2": '{"purPlanDetail":[{"hosGoodsId":"h034700001761","pkgDefId":"0b4451f1086f4c25b5eac5bf22f45c0b","pkgDefName":"支","pkgDefQty":333,"planPkgQty":33},{"hosGoodsId":"h034700001771","pkgDefId":null,"pkgDefName":"包","pkgDefQty":1,"planPkgQty":33},{"hosGoodsId":"h034700001859","pkgDefId":"26d93e6fecd24b6fa4bde8aeacfbf153","pkgDefName":"盒","pkgDefQty":1,"planPkgQty":33}],"hosId":"h0347","branchId":"h0347-2011","mgrCorpName":"邹城市人民医院(test)","deptName":"","deptId":"d69a68df361a4289b2262e4ef75b55a5","recOrgId":"d69a68df361a4289b2262e4ef75b55a5","recOrgName":"","areaCode":"areah03470414","areaName":"A库区","recUser":"UID-050151","recPhone":"xhs1009","recAddr":"A","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":false}'
 "payload10": '{"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":999,"pkgDefQty":1,"provId":"p00001603","provName":"北京中杉金桥生物技术有限公司(test)","subProvId":"p56a4","subProvName":"国药集团浙江医疗器材有限公司","hosGoodsId":"h034700001757","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}'
 "payload11": {"pid":"%s","hosGoodsName":"","hosGoodsSpec":"","provName":"","purModes":[],"subProvName":""}
-"payload12": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":2,"planPkgQty":800,"pkgDefQty":33,"provId":"p10d95","provName":"浙江高仰医疗科技有限公司","subProvId":"p10d95","subProvName":"浙江高仰医疗科技有限公司","hosGoodsId":"h034700001977","purMode":10,"version":0,"pkgDefId":"56b010aba2e04f978e3038c0f53d910c","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
-"payload12_1_1": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":2,"planPkgQty":100,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":10,"version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
-"payload12_1_2": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":2,"planPkgQty":100,"pkgDefQty":1,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
-"payload12_1_3": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":2,"planPkgQty":100,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":60,"version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
+"payload12": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":800,"pkgDefQty":33,"provId":"p10d95","provName":"浙江高仰医疗科技有限公司","subProvId":"p10d95","subProvName":"浙江高仰医疗科技有限公司","hosGoodsId":"h034700001977","purMode":10,"version":0,"pkgDefId":"56b010aba2e04f978e3038c0f53d910c","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
+"payload12_1_1": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":10,"version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
+"payload12_1_2": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":1,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
+"payload12_1_3": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":60,"version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
 
 "payload13": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":3,"planPkgQty":888,"pkgDefQty":1,"provId":"p10d95","provName":"浙江高仰医疗科技有限公司","subProvId":"p10d95","subProvName":"浙江高仰医疗科技有限公司","hosGoodsId":"h034700001947","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
 "payload14": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":888,"pkgDefQty":1,"provId":"p000029d8","provName":"国药集团湖南分公司mkcQNd","subProvId":"p000029d7","subProvName":"国药集团湖北分公司mQDwR7","hosGoodsId":"h034700001859","purMode":60,"version":0,"pkgDefId":"26d93e6fecd24b6fa4bde8aeacfbf153","purTaskId":"5c85573c049141ff8df808dabc30d2b1","sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":false}

data/b5_spd3_core_business_flow/message

 供货关系申请2:
-  e_corpId: p1e28e
+  e_corpId: p1e292
   h_corpId: h0347
-  e_username: 国药集团公司2u7a4
+  e_username: 国药集团公司K19@c
   h_name: test001

data/b5_spd3_core_business_flow/message1

 产品审核信息:
-  MSPid: MSP2406120007_1
+  MSPid: MSP2406130007_1
   hosId: h0347
-  hosGoodsId: h034700004074
-  provGoodsid: provGood-99221261
-  goodsAuditBillId: MSP2406120007
-  targetId: MSP2406120007_1
+  hosGoodsId: h034700004089
+  provGoodsid: provGood-99221276
+  goodsAuditBillId: MSP2406130007
+  targetId: MSP2406130007_1

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202406120021
-  distrBillId2: PSh0347202406120021
+  distrBillId1: PSh0347202406130021
+  distrBillId2: PSh0347202406130021
 高值配送单号:
-  distrBillId1: PSh0347202406120022
-  distrBillId2: PSh0347202406120022
+  distrBillId1: PSh0347202406130022
+  distrBillId2: PSh0347202406130022
 试剂配送单号:
-  distrBillId1: PSh0347202406120023
-  distrBillId2: PSh0347202406120023
+  distrBillId1: PSh0347202406130023
+  distrBillId2: PSh0347202406130023

data/b5_spd3_core_business_flow/message11

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

data/b5_spd3_core_business_flow/message12

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

data/b5_spd3_core_business_flow/message13

@@ -3,27 +3,27 @@
   - &id001
     - id:
       hosId: h0347
-      branchId: h0347-3667
+      branchId: h0347-3669
       deptId:
       taskType: 1
-      sourceOrgId: p1e28e
-      sourceOrgName: 国药集团公司2u7a4
-      sourceOrderNo: PSh0347202406120023
+      sourceOrgId: p1e292
+      sourceOrgName: 国药集团公司K19@c
+      sourceOrderNo: PSh0347202406130023
       billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202406120023
+      sourceId: PSh0347202406130023
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024061228235
-      purOrderNo: CG2024061218553
-      recOrgId: a463883417d44685862ebc9eb9c62990
+      planOrderNo: PLAN2024061328492
+      purOrderNo: CG2024061318657
+      recOrgId: 7020cc82c12a46e0a8ca998a00bf6760
       recOrgName: 二级检验科002
-      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'
+      billRelationJson: '{"buyBillId":"Bh03472024061300014","planBillId":"Ph034720240613025137","planOrderNo":"PLAN2024061328492","buyOrderNo":"BUY2024061304983","purOrderNo":"CG2024061318657","purBillId":"Ch034720240613000084","purBillDate":"2024-06-13
+        07:42:07","distrBillId":"PSh0347202406130023","distrOrderNo":"PSh0347202406130023"}'
+      taskDate: '2024-06-13 07:42:45'
       taskDateStart:
       taskDateEnd:
       billModeList:

data/b5_spd3_core_business_flow/message14

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