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/b5_spd3_core_business_flow/message19

 产品信息:
   list_a:
   - &id001
-    - hosGoodsId: h034700004546
-      hosGoodsCode: '00004546'
-      provId: p1e34a
-      subProvId: p1e34a
-      subProvName: 国药集团公司BCJj3
-      goodsName: 高值牙钻机yg5eu
+    - hosGoodsId: h034700005068
+      hosGoodsCode: '00005068'
+      provId: p1e3cd
+      subProvId: p1e3cd
+      subProvName: 国药集团公司Dk&FX
+      goodsName: 高值牙钻机C^!zw
       goodsSpec: G-31891
       goodsGeneralName:
       goodsMfrsId: mfrs-11229

data/b5_spd3_core_business_flow/message2

 产品审核信息:
-  MSPid: MSP2408220014_1
+  MSPid: MSP2409120007_1
   hosId: h0347
-  hosGoodsId: h034700004906
-  provGoodsid: provGood-99222158
-  goodsAuditBillId: MSP2408220014
-  targetId: MSP2408220014_1
+  hosGoodsId: h034700005069
+  provGoodsid: provGood-99222341
+  goodsAuditBillId: MSP2409120007
+  targetId: MSP2409120007_1

data/b5_spd3_core_business_flow/message20

 二级库条码信息:
   list_a:
   - &id001
-    id: '100000142024071200002733'
-    snCode: '100000142024071200002733'
-    ssccCode: '010839000189665123'
-    pkgCodeSee: '01000000000045461022221124071217250118241100000142024071200002733'
-    hosGoodsId: h034700004546
-    hosGoodsCode: '00004546'
-    goodsCode: '00004546'
-    goodsName: 高值牙钻机yg5eu
+    id: '8800000001079645'
+    snCode: '8800000001079645'
+    ssccCode: '010839000193539724'
+    pkgCodeSee: '01000000000050681124092317250401102222218800000001079645'
+    hosGoodsId: h034700005068
+    hosGoodsCode: '00005068'
+    goodsCode: '00005068'
+    goodsName: 高值牙钻机C^!zw
     goodsSpec: G-31891
     goodsMfrsName: 德国歌德公司 Geuder AG
     unit: 支
     purMode: 20
     batchCode: '2222'
-    productDate: '2024-07-12'
-    expdtDate: '2025-01-18'
+    productDate: '2024-09-23'
+    expdtDate: '2025-04-01'
     pkgDefName:
     pkgDefQty: 1.0
-    stockId: 43295b7afb7f436683e89076a51232e5
+    stockId: fef8ed0040dc467db609d7bdd413e388
     stockName: 二级检验科002库房
     areaName: 默认库区
-    areaCode: areah03472726
+    areaCode: areah03472120
     lockStatus: 0
     unitName: 1支
-    shelfCode: areah03472726-A-01-01
+    shelfCode: areah03472120-A-01-01
+    shelfName:
     shelfNo: A01-A-01-01
     pkgDefId:
-    extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202407120066", "inStockTime":
-      "2024-07-12 11:27:06", "useFrequency": 1, "distrDetailId": "03839675", "multiChargeFlag":
+    extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202409230009", "inStockTime":
+      "2024-09-23 12:09:05", "useFrequency": 1, "distrDetailId": "03841578", "multiChargeFlag":
       0}'
     bottleId:
     pkgType: '25'
@@ -38,9 +39,9 @@
     qty: 1
     shelfKind: 0
     shelfKindName: 普通货位
-    provName: 国药集团公司BCJj3
-    provId: p1e34a
-    inStockDate: '2024-07-12 11:27:07'
+    provName: 国药集团公司Dk&FX
+    provId: p1e3cd
+    inStockDate: '2024-09-23 12:09:10'
     mfrCode:
     made: 德国
     price:

data/b5_spd3_core_business_flow/message21

@@ -16,7 +16,7 @@
       pkgDefName: '100'
       pkgDefQty: 100.0
       pkgQty:
-      qty: 1000.0
+      qty: 7100.0
       goodsImg: []
       pkgDefId: ae9b52ae8e5b4f5aa501f8ea717180bb
       buyPkgQty:
@@ -34,7 +34,7 @@
       targetStockName: 东土城路院区E3YVe中心库房
       purchaseFlag: 1
       tempFlag: 0
-      grantWay: 1
+      grantWay: 3
       deptGoodsStatus:
       codingType: 0
       chargeFlag: 1
@@ -43,8 +43,8 @@
       goodsRegCert: ''
       applicationScope:
       provName: 国药集团公司Dk&FX
-      noRecPkgQty: 2.0
-      noRecQty: 200.0
+      noRecPkgQty: 9.0
+      noRecQty: 900.0
       autoUnpack: 0
       consumeQty:
       consumePkgQty:

data/b5_spd3_core_business_flow/message22

 库区信息:
   list_a:
   - &id001
-    - id: 529a05a8036748ca8c3c7c5e310ef149
-      lastModified: '2024-07-12 11:27:26'
-      version: 2
-      createTime: '2024-07-12 08:02:32'
-      createUser: h0347_UID-051410
-      lastModifiedUser: h0347_UID-051410
-      stockId: 43295b7afb7f436683e89076a51232e5
-      shelfCode: areah03472726
+    - id: 61e842f2ee614679b78328e2aee3ce67
+      lastModified: '2024-09-23 12:45:35'
+      version: 6
+      createTime: '2024-09-12 09:15:06'
+      createUser: h0347_UID-051303
+      lastModifiedUser: h0347_UID-051303
+      stockId: 17c861b1d8764fd7aaeef0240d87f39b
+      shelfCode: areah03472119
       shelfName: 默认库区
-      address: 二级检验科002
+      address: 三级检测组003
       shelfType:
       stockType: 0
       defaultFlag: 1
@@ -18,13 +18,13 @@
       parentId:
       levelCode:
       tbStatus: 1
-      linkman: h0347_UID-051410
+      linkman: h0347_UID-051303
       recPhone: None
       delFlag: 0
       shelfNo: A01
       shelfKind: 0
       hosId:
-      deptId: e6a7862c7b3d49a69ab93979a8f32710
+      deptId: 31b4f8c5f92a49c08686378f14b74c07
       areaCode:
       areaName:
       stockName:

data/b5_spd3_core_business_flow/message3

 产品审核信息:
-  MSPid: MSP2407120009_1
+  MSPid: MSP2409120008_1
   hosId: h0347
-  hosGoodsId: h034700004548
-  provGoodsid: provGood-99221749
-  goodsAuditBillId: MSP2407120009
-  targetId: MSP2407120009_1
+  hosGoodsId: h034700005070
+  provGoodsid: provGood-99222342
+  goodsAuditBillId: MSP2409120008
+  targetId: MSP2409120008_1

data/b5_spd3_core_business_flow/message4

 产品审核信息:
-  MSPid: MSP2407120010_1
+  MSPid: MSP2409120009_1
   hosId: h0347
-  hosGoodsId: h034700004549
-  provGoodsid: provGood-99221750
-  goodsAuditBillId: MSP2407120010
-  targetId: MSP2407120010_1
+  hosGoodsId: h034700005071
+  provGoodsid: provGood-99222343
+  goodsAuditBillId: MSP2409120009
+  targetId: MSP2409120009_1

data/b5_spd3_core_business_flow/message5

 产品审核信息:
-  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/b5_spd3_core_business_flow/message6

 产品包装信息:
-  unitPackageid1: ad7ebe1c0b0d42869c1bff9468f0d727
-  unitPackageid2: ad7ebe1c0b0d42869c1bff9468f0d727
+  unitPackageid1: ae9b52ae8e5b4f5aa501f8ea717180bb
+  unitPackageid2: ae9b52ae8e5b4f5aa501f8ea717180bb

data/b5_spd3_core_business_flow/message7

 采购计划单号:
-  orderNo1: PLAN2024071232518
-  orderNo2: PLAN2024071232518
+  orderNo1: PLAN2024092424670
+  orderNo2: PLAN2024092424670

data/b5_spd3_core_business_flow/message8

 配送订单信息:
   list_a:
   - &id001
-    - id: Nh034720240712000002
-      orderNo: SSTZ202407120319
-      sourceOrderNo: SSSQ202407120341
-      hosId: h0347
-      hosName: 邹城市人民医院(test)
-      branchName: 东土城路院区&BvGU
-      recDeptName: 二级检验科002
-      operName: 血管扩张术
-      operDate: '2024-07-13'
-      operDoctor: 李*
-      patientName: 张*
-      status: 10
-      statusText: 待确认
+    - id: Ch034720240924000056
+      lastModified: '2024-09-24 12:42:26'
       version: 0
-      patientInHosId: '123456'
-      surDeptName: ''
-      remark: 自动化测试
-      createUserName: 自动化测试S1C9r
-      distPriority: 0
-      distPriorityText:
-      distId:
-      distNo:
+      createTime: '2024-09-24 12:42:26'
+      createUser: h0347_UID-051303
+      lastModifiedUser:
+      orderNo: CG2024092417256
+      billMode: '66'
+      recType: HDI
+      hosId: h0347
+      branchId: h0347-3641
+      deptId:
+      deptName:
+      recOrgId: 327ed981d695457880bc5622fa90d641
+      recOrgName: 二级检验科002
+      areaCode:
+      areaName:
+      billExpdtDate:
+      sourceId: Ph034720240924021314
+      sourceType:
+      inSettlement:
+      recUser:
+      recPhone:
+      recAddr: 自动化测试
+      provId: p1e3cd
+      provName: 国药集团公司Dk&FX
+      subSendFlag:
+      exeProvId: p1e3cd
+      exeProvName: 国药集团公司Dk&FX
+      billRelationJson:
+      extInfo:
+      barcodeFlag: 1
+      pkgFlag:
+      remark: ''
+      priority:
+      closeStatus: 0
+      closeDate:
+      upStatus:
+      tbStatus: 30
       hosVersion: 3
-      createTime: '2024-07-12 11:25:41'
-      sumQty:
-      sumAmount:
-      operationPkg: 0
-      provId: p1e34a
-      provName: 国药集团公司BCJj3
-      subProvId: ''
-      subProvName: ''
-      recDeptId: e6a7862c7b3d49a69ab93979a8f32710
+      billType: CGD
+      hosName: 邹城市人民医院(test)
+      branchName: 东土城路院区E3YVe
+      sumQty: 100.0
+      sumPkgQty: 1.0
+      sumAmount: '9999.9900'
+      sumReplQty: 0.0
+      planOrderNo: PLAN2024092424669
+      replBillNo:
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message9

 配送订单详细信息:
   list_a:
   - &id001
-    id: Nh034720240712000002
-    orderNo: SSTZ202407120319
-    sourceOrderNo: SSSQ202407120341
-    hosId: h0347
-    hosName: 邹城市人民医院(test)
-    branchName: 东土城路院区&BvGU
-    recDeptName: 二级检验科002
-    operName: 血管扩张术
-    operDate: '2024-07-13'
-    operDoctor: 李*
-    patientName: 张*
-    status: 20
-    statusText: 待配送
-    version: 1
-    patientInHosId: '123456'
-    surDeptName: ''
-    remark: 自动化测试
-    createUserName: 自动化测试S1C9r
-    distPriority: 0
-    distPriorityText: 否
-    distId:
-    distNo:
-    hosVersion: 3
-    createTime: '2024-07-12 11:25:41'
-    sumQty: 1
-    sumAmount: '99.9999'
-    operationPkg: 0
-    provId: p1e34a
-    provName: 国药集团公司BCJj3
-    subProvId: ''
-    subProvName: ''
-    recDeptId: e6a7862c7b3d49a69ab93979a8f32710
-  list_b:
-  - *id001
-  list_c:
-  - *id001
-配送订单详细信息2:
-  list_a:
-  - &id001
-    - id: h034720240712000002
-      hosGoodsId: h034700004546
-      goodsNum: 1
+    - id: a5210a576c294154a5a4eeafbbf44564
+      lastModified:
+      version:
+      createTime:
+      createUser:
+      lastModifiedUser:
+      pid: Ch034720240924000056
+      orderNo: CG2024092417256
+      sourceId: f3c2fbd85df04171a0eab092bca54ced
+      hosGoodsId: h034700005070
+      mdmGoodsCode: '11662098'
+      goodsCode: '00005070'
+      purMode: 60
       price: '99.9999'
-      inSettlement: 3
-      inSettlementText: 消耗结算
-      goodsName: 高值牙钻机yg5eu
-      goodsSpec: G-31891
-      goodsCode: '00004546'
-      goodsMfrsId: mfrs-11229
-      goodsMfrsName: 德国歌德公司 Geuder AG
+      supplyId: c8809711fc324f7a9a9a9eff1a6de7c8
+      pkgDefId: ae9b52ae8e5b4f5aa501f8ea717180bb
+      pkgDefName: '100'
+      pkgDefQty: 100.0
+      pkgQty: 1.0
+      qty: 100.0
+      conPkgQty: 1.0
+      conQty: 100.0
+      checkPkgQty: 0.0
+      checkQty: 0.0
+      distrPkgQty: 0.0
+      distrQty: 0.0
+      notSendQty: 0.0
+      notSendPkgQty: 0.0
+      inSettlement: 1
+      closeType: 1
+      detailRelationJson: '{"planBillId":"Ph034720240924021314","buyDetailId":"Bh034720240924000480001","planDetailId":"f3c2fbd85df04171a0eab092bca54ced"}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00005070","purMode":60,"goodsName":"新型冠状病毒检测试剂jGRMV"}'
+      remark:
+      tbStatus:
+      hosVersion:
       unit: 支
-      subProvId: p1e34a
-      subProvName: 国药集团公司BCJj3
-      totalAmount: '99.9999'
-      spdGoodsCode: '11661505'
-      barCodeMng: 2
-      erpCode: '11661505'
+      goodsName: 新型冠状病毒检测试剂jGRMV
+      mfrsId: mfrs-11229
+      mfrsName: 德国歌德公司 Geuder AG
+      goodsGg: G-31891
+      mdmGoodsSpecCode: '11662098'
+      erpCode: '11662098'
+      made: 德国
+      goodsDi: '01123456789012'
+      miDjmc:
+      miGoodsGg:
+      miGoodsXh:
+      miCode:
+      miTwentyCode:
+      miTwentysevenCode: ''
+      miKindCode:
+      purchaseContent:
+      purchaseUnit:
+      buyContent:
+      buyUnit:
+      transferRatio:
+      extend:
+      hitCode: '12'
+      hitPrice: 99.9999
+      barCodeMng: '2'
+      rfidFlag:
+      goodsRegCert: ''
+      transCond: ''
+      storageCond: ''
+      diType: gs1
+      diUse: '36410000050700'
       multiChargeFlag: 0
       useFrequency: 1
       chargeUnit:
-      hitCode: '12'
-      hitPrice: '99.999900'
-      diUse:
-      goodsDi: '01123456789012'
+      amount: '9999.9900'
+      unitName: 100支/100
+      subProvId: p1e3cd
+      subProvName: 国药集团公司Dk&FX
+      subPrice: 99.9999
+      replPkgQty: 1.0
+      replQty: 100.0
+      ybDefId:
+      logicId:
+      provGoodsId:
+      sendFlag:
+      curQry:
   list_b:
   - *id001
   list_c: