Merge remote-tracking branch 'remotes/origin/master' into core_flow

# Conflicts:
#	air_case/b5_spd3_core_business_flow/a_a2_流程二供货关系申请提交审批.air/a_a2_流程二供货关系申请提交审批.py

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202407120038
-  cname: 国药集团公司BCJj3
+  e_id: CR202409120038
+  cname: 国药集团公司Dk&FX

data/a3_mdm3_hs/message

 医院信息:
-  h_id: 湖南省人民医院wIjec
-  h_name: 湖南省人民医院wIjec
+  h_id: 湖南省人民医院bIoAC
+  h_name: 湖南省人民医院bIoAC

data/a5_mdm3_pdm/message2

 产品审核信息:
-  MSPid: MSP2407120011_1
+  MSPid: MSP2409120010_1
   hosId: h0347
-  hosGoodsId: h034700004550
-  provGoodsid: provGood-99221751
-  goodsAuditBillId: MSP2407120011
-  targetId: MSP2407120011_1
+  hosGoodsId: h034700005072
+  provGoodsid: provGood-99222344
+  goodsAuditBillId: MSP2409120010
+  targetId: MSP2409120010_1

data/a6_mdm3_si/message

 结算开票信息:
   list_a:
   - &id001
-    settleMonth: '202407'
-    pid: OBh0347202407120008
-    hosGoodsId: h034700004547
-    goodsCode: '00004547'
-    goodsName: 一次性注射器_低值gV9^n
+    settleMonth: '202409'
+    pid: OBh0347202409240006
+    hosGoodsId: h034700005069
+    goodsCode: '00005069'
+    goodsName: 一次性注射器_低值Lr^E0
     goodsGg: G-31891
     mfrsName: 德国歌德公司 Geuder AG
     unit: 支
@@ -16,18 +16,18 @@
     cacheleftAmount: 19999.98
     purMode: 10
     waitInvoicingNum: 0.0
-    invoicingPrice:
+    invoicingPrice: 99.9999
     normalContractId:
     normalContract: '1'
     detailList:
-    - pid: OBh0347202407120008
-      settleMonth: '202407'
-      accountDate: '2024-07-12'
-      hosGoodsId: h034700004547
+    - pid: OBh0347202409240006
+      settleMonth: '202409'
+      accountDate: '2024-09-24'
+      hosGoodsId: h034700005069
       batchCode: '333'
-      distrDetailId: '03839609'
-      distrId: PSh0347202407120002
-      distrOrderNo: PSh0347202407120002
+      distrDetailId: '03841377'
+      distrId: PSh0347202409120007
+      distrOrderNo: PSh0347202409120007
       settlePrice: 99.9999
       maxSettleQty: -100.0
       maxSettleAmount: -9999.99
@@ -36,11 +36,11 @@
       leftSettleQty: -100.0
       leftSettleAmount: -9999.99
       hosId: h0347
-      provId: p1e34a
-      branchId: h0347-3745
-      balanceDetId: OBh0347202407120008-000001
+      provId: p1e3cd
+      branchId: h0347-3641
+      balanceDetId: OBh0347202409240006-000001
       purMode: 10
-      barCode: '0101123456789012103331124071217250118241100000142024071200000005'
+      barCode: '01364100000506901124091217250321103332103472024091200000382'
       batchId:
       price:
       maxQty:
@@ -53,15 +53,15 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202407OBh0347202407120008h034700004547
-    - pid: OBh0347202407120008
-      settleMonth: '202407'
-      accountDate: '2024-07-12'
-      hosGoodsId: h034700004547
+      viewId: 202409OBh0347202409240006h034700005069
+    - pid: OBh0347202409240006
+      settleMonth: '202409'
+      accountDate: '2024-09-24'
+      hosGoodsId: h034700005069
       batchCode: '333'
-      distrDetailId: '03839644'
-      distrId: PSh0347202407120037
-      distrOrderNo: PSh0347202407120037
+      distrDetailId: '03841610'
+      distrId: PSh0347202409240007
+      distrOrderNo: PSh0347202409240007
       settlePrice: 99.9999
       maxSettleQty: 100.0
       maxSettleAmount: 9999.99
@@ -70,11 +70,11 @@
       leftSettleQty: 100.0
       leftSettleAmount: 9999.99
       hosId: h0347
-      provId: p1e34a
-      branchId: h0347-3745
-      balanceDetId: OBh0347202407120008-000002
+      provId: p1e3cd
+      branchId: h0347-3641
+      balanceDetId: OBh0347202409240006-000002
       purMode: 10
-      barCode: '0101123456789012103331124071217250118241100000142024071200002332'
+      barCode: 013641000005069011240924172504021033321UT240924000008
       batchId:
       price:
       maxQty:
@@ -87,10 +87,11 @@
       volumeFlag:
       onlineKind:
       invoicePrice: 99.9999
-      viewId: 202407OBh0347202407120008h034700004547
-    unique: 202407OBh0347202407120008h034700004547
+      viewId: 202409OBh0347202409240006h034700005069
+    unique: 202409OBh0347202409240006h034700005069
+    invoicePrice:
     onlineKind: '10'
-    viewId: 202407OBh0347202407120008h034700004547
+    viewId: 202409OBh0347202409240006h034700005069
   list_b:
   - *id001
   list_c:

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3761
-  branch_name: 东土城路院区l7B8J
+  branch_id: h0347-3641
+  branch_name: 东土城路院区E3YVe
 科室信息:
-  dept2_id: 924c2c4187334c01a846e1fa2323c5cf
+  dept2_id: 327ed981d695457880bc5622fa90d641
   dept2_name: 二级检验科002

data/b2_herp3_bs/message3

 用户名信息:
-  username1: 自动化测试S1C9r
-  username2: 自动化测试S1C9r
+  username1: 自动化测试gief4
+  username2: 自动化测试gief4

data/b2_herp3_bs/message4

 一级科室信息:
-  dept1_id: b82f526b0c4c438c95ccafd8a07d3af6
+  dept1_id: 2c2069ed30084987b25592be25b1c1fa
   dept1_name: 设备科001

data/b2_herp3_bs/message6

 所有科室id:
-  deptid1: b82f526b0c4c438c95ccafd8a07d3af6
-  deptid2: e6a7862c7b3d49a69ab93979a8f32710
-  deptid3: 432fefd558364c1d99239e204b3db33c
-  deptid4: af7a08388a7e4aae94b58626f1e320cf
+  deptid1: 2c2069ed30084987b25592be25b1c1fa
+  deptid2: 327ed981d695457880bc5622fa90d641
+  deptid3: 31b4f8c5f92a49c08686378f14b74c07
+  deptid4: d65807e062474e53a655822307f43c57
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002

data/b2_herp3_bs/message7

 shelfinfo:
-  shelfid: 33173d5531d045499cf59d97b2b8af83
-  shelfCode: areah03472727
+  shelfid: 0908ff9f96b74524a56bb8dab2182aa3
+  shelfCode: areah03472121
   areaName: 自动化测试

data/b5_spd3_core_business_flow/message

 供货关系申请2:
-  e_corpId: p1e3ae
+  e_corpId: p1e3cd
   h_corpId: h0347
-  e_username: 国药集团公司lSTdZ
+  e_username: 国药集团公司Dk&FX
   h_name: test_1

data/b5_spd3_core_business_flow/message1

 产品审核信息:
-  MSPid: MSP2408220013_1
+  MSPid: MSP2409120006_1
   hosId: h0347
-  hosGoodsId: h034700004905
-  provGoodsid: provGood-99222157
-  goodsAuditBillId: MSP2408220013
-  targetId: MSP2408220013_1
+  hosGoodsId: h034700005068
+  provGoodsid: provGood-99222340
+  goodsAuditBillId: MSP2409120006
+  targetId: MSP2409120006_1

data/b5_spd3_core_business_flow/message10

 低值配送单号:
-  distrBillId1: PSh0347202407120061
-  distrBillId2: PSh0347202407120061
+  distrBillId1: PSh0347202409240026
+  distrBillId2: PSh0347202409240026
 高值配送单号:
-  distrBillId1: PSh0347202407120062
-  distrBillId2: PSh0347202407120062
+  distrBillId1: PSh0347202409240027
+  distrBillId2: PSh0347202409240027
 试剂配送单号:
-  distrBillId1: PSh0347202407120063
-  distrBillId2: PSh0347202407120063
-高值跟台配送单号:
-  distrBillId1: PSh0347202407120066
-  distrBillId2: PSh0347202407120066
+  distrBillId1: PSh0347202409240028
+  distrBillId2: PSh0347202409240028

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024071232519
-  orderNo2: PLAN2024071232519
+  orderNo1: PLAN2024092424668
+  orderNo2: PLAN2024092424668

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024071232527
-  orderNo2: PLAN2024071232527
+  orderNo1: PLAN2024092424669
+  orderNo2: PLAN2024092424669

data/b5_spd3_core_business_flow/message13

@@ -3,35 +3,37 @@
   - &id001
     - id:
       hosId: h0347
-      branchId: h0347-3764
+      branchId: h0347-3641
       deptId:
       taskType: 1
-      sourceOrgId: p1e3ae
-      sourceOrgName: 国药集团公司lSTdZ
-      sourceOrderNo: PSh0347202408280004
-      billMode: '25'
+      sourceOrgId: p1e3cd
+      sourceOrgName: 国药集团公司Dk&FX
+      sourceOrderNo: PSh0347202409240028
+      billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202408280004
+      sourceId: PSh0347202409240028
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: SSSQ202408280385
-      purOrderNo: SSTZ202408280363
-      recOrgId: 9e693185220a45c5a9fb8328f4d45b5d
+      planOrderNo: PLAN2024092424669
+      purOrderNo: CG2024092417256
+      recOrgId: 327ed981d695457880bc5622fa90d641
       recOrgName: 二级检验科002
-      billRelationJson: '{"operationApplyOrderNo":"SSSQ202408280385","operationNoticeBillId":"Nh034720240828000001","distrBillId":"PSh0347202408280004","operationNoticeOrderNo":"SSTZ202408280363","distrOrderNo":"PSh0347202408280004","operationApplyBillId":"Oh034720240828000001"}'
-      taskDate: '2024-08-28 16:05:13'
+      billRelationJson: '{"buyBillId":"Bh03472024092400048","planBillId":"Ph034720240924021314","planOrderNo":"PLAN2024092424669","buyOrderNo":"BUY2024092404650","purOrderNo":"CG2024092417256","purBillId":"Ch034720240924000056","purBillDate":"2024-09-24
+        12:42:26","distrBillId":"PSh0347202409240028","distrOrderNo":"PSh0347202409240028"}'
+      taskDate: '2024-09-24 12:43:14'
       taskDateStart:
       taskDateEnd:
       billModeList:
       viewIdList:
-      supplierFlag: false
+      supplierFlag: true
       tbStatus: 20
-      remark:
+      remark: ''
       pdaFlag:
       areaCode:
+      areaCodeName:
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message14

 验收单详情信息:
   list_a:
   - &id001
-    - purMode: 20
-      unitName: 1支
-      hosGoodsId: h034700004546
+    - purMode: 60
+      unitName: 100支/100
+      hosGoodsId: h034700005070
       mdmGoodsCode:
-      spdGoodsCode: '11661505'
-      goodsCode: '00004546'
-      goodsName: 高值牙钻机yg5eu
+      spdGoodsCode: '11662098'
+      goodsCode: '00005070'
+      goodsName: 新型冠状病毒检测试剂jGRMV
       goodsGg: G-31891
       mfrsId:
       mfrsName: 德国歌德公司 Geuder AG
@@ -16,27 +16,27 @@
       goodsDi: '01123456789012'
       miCode:
       miDjmc:
-      certificateCode:
+      certificateCode: ''
       rfidFlag: 0
       pkgDefId:
-      pkgDefName:
-      pkgDefQty: 1.0
-      batchCode: '2222'
-      expdtDate: '2025-01-18'
-      productDate: '2024-07-12'
-      provName: 国药集团公司BCJj3
+      pkgDefName: '100'
+      pkgDefQty: 100.0
+      batchCode: '4444'
+      expdtDate: '2025-04-02'
+      productDate: '2024-09-24'
+      provName: 国药集团公司Dk&FX
       provId:
-      viewId: '03839675'
+      viewId: '03841631'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03839675'
+      id: '03841631'
       detailRelationJson:
-      extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00005070","purMode":60,"goodsName":"新型冠状病毒检测试剂jGRMV","ygptCode":"","transCond":"","storageCond":"","erpCode":"11662098","ybDefId":""}'
       recTemperature: 20
       recHumidity: 30
       distrPrice: 99.9999
       distrPkgQty: 1.0
-      distrQty: 1.0
+      distrQty: 100.0
       price: 99.9999
       checkQty: 0.0
       checkPkgQty: 0
@@ -44,7 +44,7 @@
       initQty:
       totalQty:
       rowNum:
-      settlement: 3
+      settlement: 1
       hdiBarcodeList:
       detailId:
       pkgCode:
@@ -58,6 +58,7 @@
       codingType: 0
       limitMessage:
       autoUnpack: 0
+      orderNo:
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024082800004
-  CHECK_NO2: CHECKh03472024082800004
+  CHECK_NO1: CHECKh03472024092400031
+  CHECK_NO2: CHECKh03472024092400031

data/b5_spd3_core_business_flow/message16

@@ -5,34 +5,309 @@
       lastModified:
       version:
       createTime:
-      createUser: h0347_UID-051410
+      createUser: h0347_UID-051303
+      lastModifiedUser:
+      billMode: '66'
+      recType:
+      stockKind:
+      purMode:
+      sourceId: DRh034720240924000086
+      sourceType: CK_TK
+      sourceVersion: 1
+      batchList:
+      billRelationJson:
+      hosId: h0347
+      deptId: 2c2069ed30084987b25592be25b1c1fa
+      deptName:
+      branchId: h0347-3641
+      branchName:
+      taskType: 2
+      sourceOrgId: 327ed981d695457880bc5622fa90d641
+      sourceOrgName: 二级检验科002
+      sourceOrderNo: DN20240924000086
+      taskSourceNo: DN20240924000086
+      areaCode:
+      areaName:
+      goodsName:
+      goodsGg:
+      startDate:
+      endDate:
+      taskDate: '2024-09-24 12:51:06'
+      pkgTaskId:
+      pkgFlag:
+      remark: ''
+      goodsSpec:
+      areaList:
+      areaDefaultFlag:
+      excludeDeptIds:
+      deptIds:
+      sourceReplId:
+      defaultAreaCode:
+      defaultAreaName:
+      sourceNo:
+      distrOrderNo:
+      deptBuyer:
+      stockName:
+      dataDeptIds:
+      oldDeptName:
+      oldOrderNo:
+      allowRejectFlag:
+      targetCodingType: 0
+      pdaFlag:
+      createUserName:
+      createUserIds:
+    - id:
+      lastModified:
+      version:
+      createTime:
+      createUser: h0347_UID-051303
+      lastModifiedUser:
+      billMode: '20'
+      recType:
+      stockKind:
+      purMode:
+      sourceId: CHECKh03472024091400014
+      sourceType: PSD
+      sourceVersion: 0
+      batchList:
+      billRelationJson:
+      hosId: h0347
+      deptId: 2c2069ed30084987b25592be25b1c1fa
+      deptName:
+      branchId: h0347-3641
+      branchName:
+      taskType: 1
+      sourceOrgId: p1e3cd
+      sourceOrgName: 国药集团公司Dk&FX
+      sourceOrderNo: YS240914014
+      taskSourceNo: PSh0347202409140006
+      areaCode: areah03472121
+      areaName: 自动化测试
+      goodsName:
+      goodsGg:
+      startDate:
+      endDate:
+      taskDate: '2024-09-14 13:12:17'
+      pkgTaskId:
+      pkgFlag:
+      remark: ''
+      goodsSpec:
+      areaList:
+      areaDefaultFlag:
+      excludeDeptIds:
+      deptIds:
+      sourceReplId:
+      defaultAreaCode:
+      defaultAreaName:
+      sourceNo:
+      distrOrderNo:
+      deptBuyer:
+      stockName:
+      dataDeptIds:
+      oldDeptName:
+      oldOrderNo:
+      allowRejectFlag:
+      targetCodingType: 0
+      pdaFlag:
+      createUserName:
+      createUserIds:
+    - id:
+      lastModified:
+      version:
+      createTime:
+      createUser: h0347_UID-051303
+      lastModifiedUser:
+      billMode: '16'
+      recType:
+      stockKind:
+      purMode:
+      sourceId: CHECKh03472024091400013
+      sourceType: PSD
+      sourceVersion: 0
+      batchList:
+      billRelationJson:
+      hosId: h0347
+      deptId: 2c2069ed30084987b25592be25b1c1fa
+      deptName:
+      branchId: h0347-3641
+      branchName:
+      taskType: 1
+      sourceOrgId: p1e3cd
+      sourceOrgName: 国药集团公司Dk&FX
+      sourceOrderNo: YS240914013
+      taskSourceNo: PSh0347202409140005
+      areaCode: areah03472121
+      areaName: 自动化测试
+      goodsName:
+      goodsGg:
+      startDate:
+      endDate:
+      taskDate: '2024-09-14 13:11:52'
+      pkgTaskId:
+      pkgFlag:
+      remark: ''
+      goodsSpec:
+      areaList:
+      areaDefaultFlag:
+      excludeDeptIds:
+      deptIds:
+      sourceReplId:
+      defaultAreaCode:
+      defaultAreaName:
+      sourceNo:
+      distrOrderNo:
+      deptBuyer:
+      stockName:
+      dataDeptIds:
+      oldDeptName:
+      oldOrderNo:
+      allowRejectFlag:
+      targetCodingType: 0
+      pdaFlag:
+      createUserName:
+      createUserIds:
+    - id:
+      lastModified:
+      version:
+      createTime:
+      createUser: h0347_UID-051303
+      lastModifiedUser:
+      billMode: '66'
+      recType:
+      stockKind:
+      purMode:
+      sourceId: CHECKh03472024091200023
+      sourceType: PSD
+      sourceVersion: 0
+      batchList:
+      billRelationJson:
+      hosId: h0347
+      deptId: 2c2069ed30084987b25592be25b1c1fa
+      deptName:
+      branchId: h0347-3641
+      branchName:
+      taskType: 1
+      sourceOrgId: p1e3cd
+      sourceOrgName: 国药集团公司Dk&FX
+      sourceOrderNo: YS240912023
+      taskSourceNo: PSh0347202409120018
+      areaCode: areah03472121
+      areaName: 自动化测试
+      goodsName:
+      goodsGg:
+      startDate:
+      endDate:
+      taskDate: '2024-09-12 13:31:43'
+      pkgTaskId:
+      pkgFlag:
+      remark: ''
+      goodsSpec:
+      areaList:
+      areaDefaultFlag:
+      excludeDeptIds:
+      deptIds:
+      sourceReplId:
+      defaultAreaCode:
+      defaultAreaName:
+      sourceNo:
+      distrOrderNo:
+      deptBuyer:
+      stockName:
+      dataDeptIds:
+      oldDeptName:
+      oldOrderNo:
+      allowRejectFlag:
+      targetCodingType: 0
+      pdaFlag:
+      createUserName:
+      createUserIds:
+    - id:
+      lastModified:
+      version:
+      createTime:
+      createUser: h0347_UID-051303
+      lastModifiedUser:
+      billMode: '20'
+      recType:
+      stockKind:
+      purMode:
+      sourceId: CHECKh03472024091200022
+      sourceType: PSD
+      sourceVersion: 0
+      batchList:
+      billRelationJson:
+      hosId: h0347
+      deptId: 2c2069ed30084987b25592be25b1c1fa
+      deptName:
+      branchId: h0347-3641
+      branchName:
+      taskType: 1
+      sourceOrgId: p1e3cd
+      sourceOrgName: 国药集团公司Dk&FX
+      sourceOrderNo: YS240912022
+      taskSourceNo: PSh0347202409120017
+      areaCode: areah03472121
+      areaName: 自动化测试
+      goodsName:
+      goodsGg:
+      startDate:
+      endDate:
+      taskDate: '2024-09-12 13:31:18'
+      pkgTaskId:
+      pkgFlag:
+      remark: ''
+      goodsSpec:
+      areaList:
+      areaDefaultFlag:
+      excludeDeptIds:
+      deptIds:
+      sourceReplId:
+      defaultAreaCode:
+      defaultAreaName:
+      sourceNo:
+      distrOrderNo:
+      deptBuyer:
+      stockName:
+      dataDeptIds:
+      oldDeptName:
+      oldOrderNo:
+      allowRejectFlag:
+      targetCodingType: 0
+      pdaFlag:
+      createUserName:
+      createUserIds:
+    - id:
+      lastModified:
+      version:
+      createTime:
+      createUser: h0347_UID-051303
       lastModifiedUser:
       billMode: '16'
       recType:
       stockKind:
       purMode:
-      sourceId: CHECKh03472024071200002
+      sourceId: CHECKh03472024091200021
       sourceType: PSD
       sourceVersion: 0
       batchList:
       billRelationJson:
       hosId: h0347
-      deptId: b82f526b0c4c438c95ccafd8a07d3af6
+      deptId: 2c2069ed30084987b25592be25b1c1fa
       deptName:
-      branchId: h0347-3745
+      branchId: h0347-3641
       branchName:
       taskType: 1
-      sourceOrgId: p1e34a
-      sourceOrgName: 国药集团公司BCJj3
-      sourceOrderNo: YS240712002
-      taskSourceNo: PSh0347202407120002
-      areaCode: areah03472727
+      sourceOrgId: p1e3cd
+      sourceOrgName: 国药集团公司Dk&FX
+      sourceOrderNo: YS240912021
+      taskSourceNo: PSh0347202409120016
+      areaCode: areah03472121
       areaName: 自动化测试
       goodsName:
       goodsGg:
       startDate:
       endDate:
-      taskDate: '2024-07-12 08:06:19'
+      taskDate: '2024-09-12 13:30:47'
       pkgTaskId:
       pkgFlag:
       remark: ''

data/b5_spd3_core_business_flow/message17

 验收单库存详情信息:
   list_a:
   - &id001
-    - id: CHECKh034720240712000020001
+    - id: DRh0347202409240000860001
       lastModified:
       version:
       createTime:
       createUser:
       lastModifiedUser:
       rowIdx:
-      purMode: 10
+      purMode: 60
       unitName: 100支/100
-      pid: CHECKh03472024071200002
-      hosGoodsId: h034700004547
-      batchCode: '333'
-      expdtDate: '2025-01-18'
-      productDate: '2024-07-12'
+      pid: DRh034720240924000086
+      hosGoodsId: h034700005070
+      batchCode: '4444'
+      expdtDate: '2025-03-21'
+      productDate: '2024-09-12'
       batchPrice: 99.9999
       settlement: 1
-      batchType: 20
-      srcBatchId: '03839609'
+      batchType: 40
+      srcBatchId: Ph034724091200012
       srcBatchPrice: 99.9999
-      shelfCode: areah03472727-2-01-01
+      shelfCode: areah03472121-2-01-01
       shelfKind:
-      barcodeId: '100000142024071200000001'
+      barcodeId: '03472024091200000525'
       subBarcodeId:
-      qty: 10000.0
-      pkgQty: 100
-      distrId: PSh0347202407120002
-      distrDetailId: '03839609'
-      pkgDefQty: 100.0
-      pkgDefName: '100'
-      viewId: h0347000045473332025-01-18100支/100
+      qty: 100.0
+      pkgQty: 1
+      distrId: PSh0347202409120009
+      distrDetailId: '03841379'
+      pkgDefQty:
+      pkgDefName:
+      viewId: h03470000507044442025-03-21100支/100
       codingType:
       batchFlag:
       hasSterilize: 0
@@ -38,53 +38,65 @@
       sterilizePassQty:
       sterilizeRejectQty:
       orderNo:
-      sourceDetailId: '03839609'
-      mdmGoodsCode: '11661506'
-      goodsCode: '00004547'
-      tbStatus: 1
-      billMode: '16'
-      hosId: h0347
-      branchId: h0347-3745
-      purBillId: Ch034720240712000031
-      provId: p1e34a
-      provName: 国药集团公司BCJj3
-      subSendFlag: 10
-      exeProvId: p1e34a
-      exeProvName: 国药集团公司BCJj3
-      purDetailId: 0442c7d1b66d4ea6a9093602094b235e
-      goodsName: 一次性注射器_低值gV9^n
+      sourceDetailId: PICKh03472409240064660001
+      mdmGoodsCode: '11662098'
+      goodsCode: '00005070'
+      tbStatus:
+      billMode:
+      hosId:
+      branchId:
+      purBillId: Ch034720240912000006
+      provId: p1e3cd
+      provName:
+      subProvId: p1e3cd
+      purDetailId:
+      goodsName: 新型冠状病毒检测试剂jGRMV
       goodsGg: G-31891
       mfrsId: mfrs-11229
       mfrsName: 德国歌德公司 Geuder AG
       made: 德国
       unit: 支
-      purPrice: 99.9999
-      pkgDefId: 78dc0eecc5f64150b0d98f3a2c367734
-      supplyId: 65a74baa3ba543699d85dbd3fa4b2bd0
-      subProvId: p1e34a
-      subProvName: 国药集团公司BCJj3
-      subPrice: 99.9999
-      distrPrice: 99.9999
-      distrPkgQty: 100.0
-      distrQty: 10000.0
+      sourceBatchId: Ph034724091200012
+      targetBatchId: Ph034724091200012
+      pkgDefId:
       certificateCode: ''
       productCertCode:
-      detailRelationJson:
       extInfo:
       psiPrice: 99.9999
       ext:
         goodsGg: G-31891
-        goodsCode: '00004547'
-        purMode: 10
-        goodsName: 一次性注射器_低值gV9^n
+        goodsCode: '00005070'
+        purMode: 60
+        goodsName: 新型冠状病毒检测试剂jGRMV
         ygptCode: ''
         transCond: ''
         storageCond: ''
-        erpCode: '11661506'
+        erpCode: '11662098'
         ybDefId: ''
-      purTaskId:
-      multiChargeFlag:
+        contractId: ''
+        normalContractId: ''
+        normalDetailId: ''
+        fcatId: ''
+        fcatName: ''
+        goodsKindId: ''
+        goodsKindName: ''
+        miTwentysevenCode: ''
+        chargeFlag: 1
+        focus_control: '0'
+        focus_control_type:
+      rtnQty:
+      hisChargeNo:
       trustMrfsName:
+      pkgCodeSee:
+      chargeFlag:
+      stockKind: CK_TK
+      sourceDeptId: 327ed981d695457880bc5622fa90d641
+      targetDeptId: 2c2069ed30084987b25592be25b1c1fa
+      ableDelFlag:
+      pickType: KS_TK
+      recTemperature:
+      recHumidity:
+      jfCode:
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message18

 条码信息:
   list_a:
   - &id001
-    id: '100000142024082200000877'
-    snCode: '100000142024082200000877'
-    ssccCode: '010839000192616327'
-    pkgCodeSee: '01376400000490701124082217250228104444241100000142024082200000877'
-    hosGoodsId: h034700004907
-    hosGoodsCode: '00004907'
-    goodsCode: '00004907'
-    goodsName: 新型冠状病毒检测试剂C7HGi
-    goodsSpec: G-31891
-    goodsMfrsName: 德国歌德公司 Geuder AG
-    unit: 支
-    purMode: 60
-    batchCode: '4444'
-    productDate: '2024-08-22'
-    expdtDate: '2025-02-28'
-    pkgDefName: '100'
-    pkgDefQty: 100.0
-    stockId: 4188c1ded3aa4c838904ee1cc6013645
-    stockName: 东土城路院区Hyl74中心库房
-    areaName: 自动化测试
-    areaCode: areah03472838
-    lockStatus: 0
-    unitName: 100支/100
-    shelfCode: areah03472838-2-01-01
-    shelfName:
-    shelfNo: 自动化测试-2-01-01
-    pkgDefId: 7b0c0e35ef8943abbc87ebd8540e3150
-    extInfo: '{"pkgDefId": "7b0c0e35ef8943abbc87ebd8540e3150", "pkgDefQty": 100, "purBillId":
-      "CG2024082223071", "pkgDefName": "100", "distrBillId": "PSh0347202408220016",
-      "inStockTime": "2024-08-22 14:23:42", "distrDetailId": "03841116", "certificateCode":
-      ""}'
-    bottleId:
-    pkgType: '66'
-    miDjmc: ''
-    miCode: ''
-    transferRatio: 1.0
-    qty: 1
-    shelfKind: 0
-    shelfKindName: 普通货位
-    provName: 国药集团公司lSTdZ
-    provId: p1e3ae
-    inStockDate:
-    mfrCode:
-    made: 德国
-    price:
-    barName: 100支/100
-    purModeText: 检验试剂
-    codeType: 66
+    - id: '03472024091200000382'
+      lastModified:
+      version:
+      createTime: '2024-09-12 10:24:23'
+      createUser:
+      lastModifiedUser:
+      snCode: '03472024091200000382'
+      hosId: h0347
+      branchId:
+      stockId: 24d5ec62951d4fe7a18bcf3c05c4af93
+      areaCode: areah03472121
+      areaName: 自动化测试
+      shelfCode: areah03472121-2-01-01
+      codeType: 16
+      tagType: 0
+      hosGoodsId: h034700005069
+      mdmGoodsCode: '11662097'
+      goodsCode: '00005069'
+      goodsDi: '36410000050690'
+      barName: 100支/100
+      batchCode: '333'
+      expdtDate: '2025-03-21'
+      productDate: '2024-09-12'
+      mfrCode:
+      mfrCodeSee:
+      pkgCode: "0136410000050690112409121725032110333\x1D2103472024091200000382"
+      pkgCodeSee: '01364100000506901124091217250321103332103472024091200000382'
+      ssccCode: '010839000193105721'
+      extInfo:
+      outId:
+      tbStatus: 20
+      goodsCodeDi:
+      barcodeId:
+      ext:
+        pkgDefId: e7da4ed969c94aaa81c61209c298c21e
+        pkgDefQty: 100
+        purBillId: CG2024091216952
+        pkgDefName: '100'
+        distrBillId: PSh0347202409120007
+        inStockTime: '2024-09-12 10:27:08'
+        distrDetailId: '03841377'
+        certificateCode: ''
+      sourceDetailId:
+      purMode: 10
+      purModes:
+      price:
+      pid:
+      goodsMfrsName: 德国歌德公司 Geuder AG
+      mfrsName:
+      goodsSpec: G-31891
+      unit: 支
+      goodsName: 一次性注射器_低值Lr^E0
+      pkgDefId: e7da4ed969c94aaa81c61209c298c21e
+      pkgDefQty: 100
+      defaultPkgDefQty:
+      defaultQty:
+      defaultSurplusQty:
+      defaultPkgDefId:
+      purDetailId:
+      pkgDefName: '100'
+      printNum: 0
+      deptId:
+      deptName:
+      billId:
+      taskId:
+      made: 德国
+      provId: p1e3cd
+      provName: 国药集团公司Dk&FX
+      subProvId: p1e3cd
+      subProvName: 国药集团公司Dk&FX
+      provHosGoodsId:
+      sourceType:
+      taskDate:
+      sourceOrderNo:
+      taskType:
+      detailId:
+      branchGoodsPkgDefList:
+      unitName:
+      areaCodeList:
+      diType:
+      mdmGoodsSpecCode:
+      hosGoodsCode: '00005069'
+      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:
+      verifyFlag:
+      scanType:
+      goodsRegCert:
+      jfCode:
+      pkgCount:
+      subSendFlag: 10
   list_b:
   - *id001
   list_c: