Merge remote-tracking branch 'remotes/origin/core_folw'

# Conflicts:
#	data/b5_spd3_core_business_flow/message10
#	data/b5_spd3_core_business_flow/message11
#	data/b5_spd3_core_business_flow/message12
#	data/b5_spd3_core_business_flow/message13
#	data/b5_spd3_core_business_flow/message14
#	data/b5_spd3_core_business_flow/message15
#	data/b5_spd3_core_business_flow/message8
#	data/b5_spd3_core_business_flow/message9

air_case/b6_spd3_core_business_flow_database_check/a_b3流程十请领业务流_二级库向边仓_数据库验证.air/a_b3流程十请领业务流_二级库向边仓_数据库验证.py

@@ -21,7 +21,7 @@ python runner_test.py tag id2303-13 debug mdm3
 """
 
 
-def check_mcms_dept_buy(type=1):
+def check_mcms_dept_buy_car(type=1):
     hos_goods_id='hos_goods_id'
     if type==1:
         hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
@@ -44,7 +44,7 @@ def check_mcms_dept_buy(type=1):
     print('create_time', create_time, 'id', id)
     sql = """select * from mcms_dept_buy_car where branch_id='%s' and hos_goods_id='%s' LIMIT 1;
              """ % (branch_id, hos_goods_id)
-    actual_value1 = check_mcms_dept_buy_car(sql)
+    actual_value1 = check_mcms_dept_buy_car_sql(sql)
     print(actual_value1)
     deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
     deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
@@ -95,37 +95,72 @@ def check_mcms_dept_buy(type=1):
         print('error')
         commonFuc().check_text_exist_result_text('error', 'succees')
 
+def check_mcms_dept_buy():
+    branch_id = get_branch_id()
+    sql = """select * from mcms_dept_buy where branch_id='%s' order by create_time desc LIMIT 3;;
+                 """ % (branch_id)
+    actual=check_mcms_dept_buy_sql(sql)
+    print(actual)
+    #获取主键id
+    sql="select id from  mcms_dept_buy where branch_id='%s' order by create_time desc  LIMIT 3;"%branch_id
+    id=get_dept_buy_id(sql)
+    id1=process_tuple(id[0]);id2=process_tuple(id[1]);id3=process_tuple(id[2])
+    #获取order_no
+    sql1 = "select order_no from  mcms_dept_buy where branch_id='%s' order by create_time desc LIMIT 3;" % branch_id
+    order_no = get_dept_buy_id(sql1)
+    order_no1 = process_tuple(order_no[0]); order_no2 = process_tuple(order_no[1])
+    order_no3 = process_tuple(order_no[2])
+    print(id1,id2,id3,order_no1,order_no2,order_no3)
+    deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
+    deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+    target_dept_id=FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid1']
 
-
+    area_code = get_stockAreaId_new(deptid2, deptname2, 2)
+    area_name = '默认库区'
+    # 读取文件中的信息
+    info = FileUtils().r_info8('b5_spd3_core_business_flow', "二级库请领产品信息", 'message21')
+    list_a = info['list_a']
+    mdm_goods_code = commonFuc().analysis_json('mdmGoodsCode', list_a)
+    pur_mode = commonFuc().analysis_json('purMode', list_a)
+    goodsCode = commonFuc().analysis_json('goodsCode', list_a)
+    pkgDefId = commonFuc().analysis_json('pkgDefId', list_a)
+    pkgDefName = commonFuc().analysis_json('pkgDefName', list_a)
+    target_stock_id='边仓id,从边仓表获取'
+    expected=commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                        'mcms_dept_buy', id1, order_no1,get_hosid(),branch_id,deptid2,deptname2,area_code,area_name,target_dept_id,target_dept_name,target_stock_id)
+    print('expected',expected)
 try:
-    set_dept_lead()  # 设置二级科室负责人
-    # 科室必须同步到外网，集中管控平台创建边仓才能选择到用户,"deptType":"0"
-    pro_path = commonFuc().get_pro_path2()
-    print('pro_path', pro_path)
-    sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air')
-    using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air')
-    from a_b3流程十请领业务流_二级库向边仓 import add_logic_stock
-
-    add_logic_stock()
-
-    from a_b3流程十请领业务流_二级库向边仓 import goods_move
-    from a_b3流程十请领业务流_二级库向边仓 import second_dept_Request
-    from a_b3流程十请领业务流_二级库向边仓 import BuyCarSubmit
-    from a_b3流程十请领业务流_二级库向边仓 import check_buyWayText
-
-    # # 设置产品出库渠道为边仓
-    goods_move()
-    updateUserLoginDefaultRange(get_listUserMgrRangePage(2))  # 设置登录账号默认权限是二级库
-    # # # # 低值
-    second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
-    check_mcms_dept_buy(1)
-    # # # 高值
-    second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
-    check_mcms_dept_buy(2)
-    # # # 试剂
-    second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
-    check_mcms_dept_buy(3)
+    #==============暂时注释==================
+    # set_dept_lead()  # 设置二级科室负责人
+    # # 科室必须同步到外网，集中管控平台创建边仓才能选择到用户,"deptType":"0"
+    # pro_path = commonFuc().get_pro_path2()
+    # print('pro_path', pro_path)
+    # sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air')
+    # using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air')
+    # from a_b3流程十请领业务流_二级库向边仓 import add_logic_stock
+    #
+    # add_logic_stock()
+    #
+    # from a_b3流程十请领业务流_二级库向边仓 import goods_move
+    # from a_b3流程十请领业务流_二级库向边仓 import second_dept_Request
+    # from a_b3流程十请领业务流_二级库向边仓 import BuyCarSubmit
+    # from a_b3流程十请领业务流_二级库向边仓 import check_buyWayText
+    #
+    # # # 设置产品出库渠道为边仓
+    # goods_move()
+    # updateUserLoginDefaultRange(get_listUserMgrRangePage(2))  # 设置登录账号默认权限是二级库
+    # # # # # 低值
+    # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
+    # check_mcms_dept_buy_car(1)
+    # # # # 高值
+    # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
+    # check_mcms_dept_buy_car(2)
+    # # # # 试剂
+    # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
+    # check_mcms_dept_buy_car(3)
     # BuyCarSubmit()  # 请领车提交
+    # ==============暂时注释==================
+    check_mcms_dept_buy()
     # for i in range(6):  # 三个单据共审批6次
     #     approval_center()
     # check_buyWayText()#验证出库渠道是否为边仓

common/db/sql/sql_tools.py

@@ -104,12 +104,17 @@ def main2(hos_goods_id):
     res_dict = get_dict_data_sql(cursor, sql)
     print('res_dict',res_dict)
     return res_dict
-def check_mcms_dept_buy_car(sql):
+def check_mcms_dept_buy_car_sql(sql):
     db, cursor = get_sql_conn()
-    # sql = """select * from mcms_dept_buy_car where branch_id='%s' and hos_goods_id='%s';
-    #      """ % (branch_id,hos_goods_id)
     res_dict = get_dict_data_sql(cursor, sql)
     print('res_dict', res_dict)
+    cursor.close()
+    return res_dict
+def check_mcms_dept_buy_sql(sql):
+    db, cursor = get_sql_conn()
+    res_dict = get_dict_data_sql(cursor, sql)
+    print('res_dict', res_dict)
+    cursor.close()
     return res_dict
 def get_create_time(sql):
     db, cursor = get_sql_conn()
@@ -134,6 +139,19 @@ def get_id(sql):
     # print(new_str1)
     cursor.close()
     return new_str1
+def get_dept_buy_id(sql):
+    db, cursor = get_sql_conn()
+    cursor.execute(sql)
+    results = cursor.fetchall()
+    cursor.close()
+    return results
+def process_tuple(tuple1):
+    str1 = str(tuple1)
+    new_str1 = str1.replace(',)', '')
+    new_str1 = new_str1.replace('(', '')
+    new_str1 = new_str1.replace(',', '')
+    new_str1 = new_str1.replace("'", '')
+    return new_str1
 
-hos_goods_id = 'h034700004220'
-main2(hos_goods_id)
\ No newline at end of file
+# hos_goods_id = 'h034700004220'
+# main2(hos_goods_id)
\ No newline at end of file

data/b2_herp3_bs/message6

@@ -3,8 +3,10 @@
   deptid2: 7b4d11aec57042e096684a46e9148fdd
   deptid3: 9a0e8ab0eb5544deafbeb2ce79eabf72
   deptid4: 319b64576fe24cc2b24bff3e7d8815c7
+  deptid5: ec0ec1a2feb94132ba4c7daba5133159
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002
   deptid3: 三级检测组003
   deptid4: 科室004
+  deptid5: 二级科室005

data/b5_spd3_core_business_flow/message10

-高值跟台配送单号:
-  distrBillId1: PSh0347202407090015
-  distrBillId2: PSh0347202407090015
+低值配送单号:
+  distrBillId1: PSh0347202407090060
+  distrBillId2: PSh0347202407090060
+高值配送单号:
+  distrBillId1: PSh0347202407090061
+  distrBillId2: PSh0347202407090061
+试剂配送单号:
+  distrBillId1: PSh0347202407090062
+  distrBillId2: PSh0347202407090062

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024070931847
-  orderNo2: PLAN2024070931847
+  orderNo1: PLAN2024070931920
+  orderNo2: PLAN2024070931920

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024070931848
-  orderNo2: PLAN2024070931848
+  orderNo1: PLAN2024070931922
+  orderNo2: PLAN2024070931922

data/b5_spd3_core_business_flow/message13

@@ -8,28 +8,29 @@
       taskType: 1
       sourceOrgId: p1e332
       sourceOrgName: 国药集团公司L1slG
-      sourceOrderNo: PSh0347202407090015
-      billMode: '25'
+      sourceOrderNo: PSh0347202407090062
+      billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202407090015
+      sourceId: PSh0347202407090062
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: SSSQ202407090333
-      purOrderNo: SSTZ202407090309
+      planOrderNo: PLAN2024070931922
+      purOrderNo: CG2024070920928
       recOrgId: 7b4d11aec57042e096684a46e9148fdd
       recOrgName: 二级检验科002
-      billRelationJson: '{"operationApplyOrderNo":"SSSQ202407090333","operationNoticeBillId":"Nh034720240709000002","distrBillId":"PSh0347202407090015","operationNoticeOrderNo":"SSTZ202407090309","distrOrderNo":"PSh0347202407090015","operationApplyBillId":"Oh034720240709000002"}'
-      taskDate: '2024-07-09 09:01:24'
+      billRelationJson: '{"buyBillId":"Bh03472024070900081","planBillId":"Ph034720240709028567","planOrderNo":"PLAN2024070931922","buyOrderNo":"BUY2024070906129","purOrderNo":"CG2024070920928","purBillId":"Ch034720240709000102","purBillDate":"2024-07-09
+        11:37:11","distrBillId":"PSh0347202407090062","distrOrderNo":"PSh0347202407090062"}'
+      taskDate: '2024-07-09 11:38:26'
       taskDateStart:
       taskDateEnd:
       billModeList:
       viewIdList:
-      supplierFlag: false
+      supplierFlag: true
       tbStatus: 20
-      remark:
+      remark: ''
       pdaFlag:
   list_b:
   - *id001

data/b5_spd3_core_business_flow/message14

 验收单详情信息:
   list_a:
   - &id001
-    - purMode: 20
-      unitName: 1支
-      hosGoodsId: h034700004510
+    - purMode: 60
+      unitName: 100支/100
+      hosGoodsId: h034700004512
       mdmGoodsCode:
-      spdGoodsCode: '11661463'
-      goodsCode: '00004510'
-      goodsName: 高值牙钻机Mm)84
+      spdGoodsCode: '11661465'
+      goodsCode: '00004512'
+      goodsName: 新型冠状病毒检测试剂t(I8N
       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'
+      pkgDefName: '100'
+      pkgDefQty: 100.0
+      batchCode: '4444'
       expdtDate: '2025-01-15'
       productDate: '2024-07-09'
       provName: 国药集团公司L1slG
       provId:
-      viewId: '03839421'
+      viewId: '03839469'
       verifyFlag: 0
       hasSterilize: 0
-      id: '03839421'
+      id: '03839469'
       detailRelationJson:
-      extInfo: '{"ygptCode":"","transCond":"","storageCond":"","erpCode":""}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004512","purMode":60,"goodsName":"新型冠状病毒检测试剂t(I8N","ygptCode":"","transCond":"","storageCond":"","erpCode":"11661465","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:

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024070900011
-  CHECK_NO2: CHECKh03472024070900011
+  CHECK_NO1: CHECKh03472024070900053
+  CHECK_NO2: CHECKh03472024070900053

data/b5_spd3_core_business_flow/message16

 上架入库列表数据:
   list_a:
   - &id001
+    - id:
+      lastModified:
+      version:
+      createTime:
+      createUser: h0347_UID-051404
+      lastModifiedUser:
+      billMode: '66'
+      recType:
+      stockKind:
+      purMode:
+      sourceId: DRh034720240709000126
+      sourceType: CK_TK
+      sourceVersion: 1
+      batchList:
+      billRelationJson:
+      hosId: h0347
+      deptId: d467187bce7f458eb5c4e1007f557353
+      deptName:
+      branchId: h0347-3738
+      branchName:
+      taskType: 2
+      sourceOrgId: 7b4d11aec57042e096684a46e9148fdd
+      sourceOrgName: 二级检验科002
+      sourceOrderNo: DN20240709000126
+      taskSourceNo: DN20240709000126
+      areaCode:
+      areaName:
+      goodsName:
+      goodsGg:
+      startDate:
+      endDate:
+      taskDate: '2024-07-09 12:16:02'
+      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:
@@ -11,7 +66,7 @@
       recType:
       stockKind:
       purMode:
-      sourceId: CHECKh03472024070900008
+      sourceId: CHECKh03472024070900027
       sourceType: PSD
       sourceVersion: 0
       batchList:
@@ -24,15 +79,15 @@
       taskType: 1
       sourceOrgId: p1e332
       sourceOrgName: 国药集团公司L1slG
-      sourceOrderNo: YS240709008
-      taskSourceNo: PSh0347202407090011
+      sourceOrderNo: YS240709027
+      taskSourceNo: PSh0347202407090032
       areaCode: areah03472689
       areaName: 自动化测试
       goodsName:
       goodsGg:
       startDate:
       endDate:
-      taskDate: '2024-07-09 08:50:44'
+      taskDate: '2024-07-09 10:30:56'
       pkgTaskId:
       pkgFlag:
       remark: ''

data/b5_spd3_core_business_flow/message17

 验收单库存详情信息:
   list_a:
   - &id001
-    - id: CHECKh034720240709000080001
+    - id: DRh0347202407090001260001
       lastModified:
       version:
       createTime:
       createUser:
       lastModifiedUser:
       rowIdx:
-      purMode: 10
+      purMode: 60
       unitName: 100支/100
-      pid: CHECKh03472024070900008
-      hosGoodsId: h034700004511
-      batchCode: '333'
+      pid: DRh034720240709000126
+      hosGoodsId: h034700004512
+      batchCode: '4444'
       expdtDate: '2025-01-15'
       productDate: '2024-07-09'
       batchPrice: 99.9999
       settlement: 1
-      batchType: 20
-      srcBatchId: '03839417'
+      batchType: 40
+      srcBatchId: Ph034724070900003
       srcBatchPrice: 99.9999
       shelfCode: areah03472689-2-01-01
       shelfKind:
-      barcodeId: '100000142024070900000901'
+      barcodeId: '100000142024070900000805'
       subBarcodeId:
-      qty: 10000.0
-      pkgQty: 100
-      distrId: PSh0347202407090011
-      distrDetailId: '03839417'
-      pkgDefQty: 100.0
-      pkgDefName: '100'
-      viewId: h0347000045113332025-01-15100支/100
+      qty: 100.0
+      pkgQty: 1
+      distrId: PSh0347202407090010
+      distrDetailId: '03839416'
+      pkgDefQty:
+      pkgDefName:
+      viewId: h03470000451244442025-01-15100支/100
       codingType:
       batchFlag:
       hasSterilize: 0
@@ -38,53 +38,60 @@
       sterilizePassQty:
       sterilizeRejectQty:
       orderNo:
-      sourceDetailId: '03839417'
-      mdmGoodsCode: '11661464'
-      goodsCode: '00004511'
-      tbStatus: 1
-      billMode: '16'
-      hosId: h0347
-      branchId: h0347-3738
-      purBillId: Ch034720240709000040
+      sourceDetailId: PICKh03472407090091660001
+      mdmGoodsCode: '11661465'
+      goodsCode: '00004512'
+      tbStatus:
+      billMode:
+      hosId:
+      branchId:
+      purBillId: Ch034720240709000039
       provId: p1e332
-      provName: 国药集团公司L1slG
-      subSendFlag: 10
-      exeProvId: p1e332
-      exeProvName: 国药集团公司L1slG
-      purDetailId: e0b9217ab56d489997e77954116cad28
-      goodsName: 一次性注射器_低值5^*N%
+      provName:
+      subProvId: p1e332
+      purDetailId:
+      goodsName: 新型冠状病毒检测试剂t(I8N
       goodsGg: G-31891
       mfrsId: mfrs-11229
       mfrsName: 德国歌德公司 Geuder AG
       made: 德国
       unit: 支
-      purPrice: 99.9999
-      pkgDefId: 012d0a2b966a4e84b58793c6855af34d
-      supplyId: 8113ddc3e5174ee2aa72fb94a369526a
-      subProvId: p1e332
-      subProvName: 国药集团公司L1slG
-      subPrice: 99.9999
-      distrPrice: 99.9999
-      distrPkgQty: 100.0
-      distrQty: 10000.0
+      sourceBatchId: Ph034724070900003
+      targetBatchId: Ph034724070900003
+      pkgDefId:
       certificateCode: ''
       productCertCode:
-      detailRelationJson:
       extInfo:
       psiPrice: 99.9999
       ext:
         goodsGg: G-31891
-        goodsCode: '00004511'
-        purMode: 10
-        goodsName: 一次性注射器_低值5^*N%
+        goodsCode: '00004512'
+        purMode: 60
+        goodsName: 新型冠状病毒检测试剂t(I8N
         ygptCode: ''
         transCond: ''
         storageCond: ''
-        erpCode: '11661464'
+        erpCode: '11661465'
         ybDefId: ''
-      purTaskId:
-      multiChargeFlag:
+        contractId: ''
+        normalContractId: ''
+        fcatId: ''
+        fcatName: ''
+        goodsKindId: ''
+        goodsKindName: ''
+        miTwentysevenCode: ''
+        focus_control: '0'
+        focus_control_type:
+      rtnQty:
+      hisChargeNo:
       trustMrfsName:
+      pkgCodeSee:
+      chargeFlag:
+      stockKind: CK_TK
+      sourceDeptId: 7b4d11aec57042e096684a46e9148fdd
+      targetDeptId: d467187bce7f458eb5c4e1007f557353
+      ableDelFlag:
+      pickType: KS_TK
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message18

 条码信息:
   list_a:
   - &id001
-    - id: '100000142024070900000602'
-      lastModified:
-      version:
-      createTime: '2024-07-09 08:41:23'
-      createUser:
-      lastModifiedUser:
-      snCode: '100000142024070900000602'
-      hosId: h0347
-      branchId:
-      stockId: 32bc153acdb34c969f4ed39bf10d58c2
-      areaCode: areah03472689
-      areaName: 自动化测试
-      shelfCode: areah03472689-2-01-01
-      codeType: 16
-      tagType: 0
-      hosGoodsId: h034700004511
-      mdmGoodsCode: '11661464'
-      goodsCode: '00004511'
-      goodsDi: '37380000045110'
-      barName: 100支/100
-      batchCode: '333'
-      expdtDate: '2025-01-15'
-      productDate: '2024-07-09'
-      mfrCode:
-      mfrCodeSee:
-      pkgCode: "013738000004511010333\x1D1124070917250115241100000142024070900000602"
-      pkgCodeSee: '0137380000045110103331124070917250115241100000142024070900000602'
-      ssccCode: '010839000188893220'
-      extInfo:
-      outId:
-      tbStatus: 20
-      goodsCodeDi:
-      barcodeId:
-      ext:
-        pkgDefId: 012d0a2b966a4e84b58793c6855af34d
-        pkgDefQty: 100
-        purBillId: CG2024070920863
-        pkgDefName: '100'
-        distrBillId: PSh0347202407090008
-        inStockTime: '2024-07-09 08:43:58'
-        distrDetailId: '03839414'
-        certificateCode: ''
-      sourceDetailId:
-      purMode: 10
-      purModes:
-      price:
-      pid:
-      goodsMfrsName: 德国歌德公司 Geuder AG
-      mfrsName:
-      goodsSpec: G-31891
-      unit: 支
-      goodsName: 一次性注射器_低值5^*N%
-      pkgDefId: 012d0a2b966a4e84b58793c6855af34d
-      pkgDefQty: 100
-      defaultPkgDefQty:
-      defaultQty:
-      defaultSurplusQty:
-      defaultPkgDefId:
-      purDetailId:
-      pkgDefName: '100'
-      printNum: 0
-      deptId:
-      deptName:
-      billId:
-      taskId:
-      made: 德国
-      provId: p1e332
-      provName: 国药集团公司L1slG
-      subProvId: p1e332
-      subProvName: 国药集团公司L1slG
-      provHosGoodsId:
-      sourceType:
-      taskDate:
-      sourceOrderNo:
-      taskType:
-      detailId:
-      branchGoodsPkgDefList:
-      unitName:
-      areaCodeList:
-      diType:
-      mdmGoodsSpecCode:
-      hosGoodsCode: '00004511'
-      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:
-      subSendFlag: 10
+    id: '100000142024070900000806'
+    snCode: '100000142024070900000806'
+    ssccCode: '010839000188913621'
+    pkgCodeSee: '01373800000451201044441124070917250115241100000142024070900000806'
+    hosGoodsId: h034700004512
+    hosGoodsCode: '00004512'
+    goodsCode: '00004512'
+    goodsName: 新型冠状病毒检测试剂t(I8N
+    goodsSpec: G-31891
+    goodsMfrsName: 德国歌德公司 Geuder AG
+    unit: 支
+    purMode: 60
+    batchCode: '4444'
+    productDate: '2024-07-09'
+    expdtDate: '2025-01-15'
+    pkgDefName: '100'
+    pkgDefQty: 100.0
+    stockId: 32bc153acdb34c969f4ed39bf10d58c2
+    stockName: 东土城路院区8SpTq中心库房
+    areaName: 自动化测试
+    areaCode: areah03472689
+    lockStatus: 0
+    unitName: 100支/100
+    shelfCode: areah03472689-2-01-01
+    shelfNo: 自动化测试-2-01-01
+    pkgDefId: 8ce905b956f14453b958d0da398c0350
+    extInfo: '{"pkgDefId": "8ce905b956f14453b958d0da398c0350", "pkgDefQty": 100, "purBillId":
+      "CG2024070920865", "pkgDefName": "100", "distrBillId": "PSh0347202407090010",
+      "inStockTime": "2024-07-09 08:43:33", "distrDetailId": "03839416", "certificateCode":
+      ""}'
+    bottleId:
+    pkgType: '66'
+    miDjmc: ''
+    miCode: ''
+    transferRatio: 1.0
+    qty: 1
+    shelfKind: 0
+    shelfKindName: 普通货位
+    provName: 国药集团公司L1slG
+    provId: p1e332
+    inStockDate:
+    mfrCode:
+    made: 德国
+    price:
+    barName: 100支/100
+    purModeText: 检验试剂
+    codeType: 66
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message21

 二级库请领产品信息:
   list_a:
   - &id001
-    - hosGoodsId: h034700004076
+    - hosGoodsId: h034700004512
       purMode: 60
       grantRule:
       id:
-      goodsName: 新型冠状病毒检测试剂DJUhI
+      goodsName: 新型冠状病毒检测试剂t(I8N
       goodsSpec: G-31891
-      mdmGoodsCode: '11661024'
-      goodsCode: '00004076'
+      mdmGoodsCode: '11661465'
+      goodsCode: '00004512'
       unit: 支
       goodsMfrsName: 德国歌德公司 Geuder AG
       miDjmc: ''
@@ -16,33 +16,33 @@
       pkgDefName: '100'
       pkgDefQty: 100.0
       pkgQty:
-      qty: 400.0
+      qty: 600.0
       goodsImg: []
-      pkgDefId: 0d3db4404bcb46b9b80830502f069b4f
+      pkgDefId: 8ce905b956f14453b958d0da398c0350
       buyPkgQty:
       unitName: 100支/100
       price: 99.9999
       hosId:
       branchId:
-      deptId: a463883417d44685862ebc9eb9c62990
+      deptId: 7b4d11aec57042e096684a46e9148fdd
       deptName:
       areaCode:
       areaName:
-      targetDeptId: 42d415ddd37444858d61aa923d936b16
+      targetDeptId: d467187bce7f458eb5c4e1007f557353
       targetDeptName: 设备科001
-      targetStockId: 61b06063d63c43848a1bac7f3a3debb4
-      targetStockName: 东土城路院区!uON*中心库房
+      targetStockId: 32bc153acdb34c969f4ed39bf10d58c2
+      targetStockName: 东土城路院区8SpTq中心库房
       purchaseFlag: 1
       tempFlag: 0
-      grantWay: 3
+      grantWay: 2
       deptGoodsStatus:
       codingType: 0
       purModeText: 检验试剂
       goodsGeneralName: 检测试剂
-      provName: 国药集团公司2u7a4
-      noRecPkgQty: 1.0
-      noRecQty: 100.0
-      autoUnpack:
+      provName: 国药集团公司L1slG
+      noRecPkgQty: 12.0
+      noRecQty: 1200.0
+      autoUnpack: 0
       consumeQty:
       consumePkgQty:
   list_b:

data/b5_spd3_core_business_flow/message22

@@ -2,11 +2,11 @@
   list_a:
   - &id001
     - id: b45a3ceccda94d5ab2f06a00d636d14f
-      lastModified: '2024-07-09 05:03:32'
-      version: 0
+      lastModified: '2024-07-09 11:01:55'
+      version: 6
       createTime: '2024-07-09 05:03:32'
-      createUser: UID-050151
-      lastModifiedUser: UID-050151
+      createUser: h0347_UID-051404
+      lastModifiedUser: h0347_UID-051404
       stockId: 26779c8a02644b9a8089cc0909d214c0
       shelfCode: areah03472686
       shelfName: 默认库区
@@ -18,8 +18,8 @@
       parentId:
       levelCode:
       tbStatus: 1
-      linkman:
-      recPhone:
+      linkman: h0347_UID-051404
+      recPhone: None
       delFlag: 0
       shelfNo: A01
       shelfKind: 0

data/b5_spd3_core_business_flow/message7

 采购计划单号:
-  orderNo1: PLAN2024070931846
-  orderNo2: PLAN2024070931846
+  orderNo1: PLAN2024070931921
+  orderNo2: PLAN2024070931921

data/b5_spd3_core_business_flow/message8

 配送订单信息:
   list_a:
   - &id001
-    - id: Nh034720240709000002
-      orderNo: SSTZ202407090309
-      sourceOrderNo: SSSQ202407090333
-      hosId: h0347
-      hosName: 邹城市人民医院(test)
-      branchName: 东土城路院区8SpTq
-      recDeptName: 二级检验科002
-      operName: 血管扩张术
-      operDate: '2024-07-10'
-      operDoctor: 李*
-      patientName: 张*
-      status: 10
-      statusText: 待确认
+    - id: Ch034720240709000102
+      lastModified: '2024-07-09 11:37:11'
       version: 0
-      patientInHosId: '123456'
-      surDeptName: ''
-      remark: 自动化测试
-      createUserName: 自动化测试lVbzF
-      distPriority: 0
-      distPriorityText:
-      distId:
-      distNo:
-      hosVersion: 3
-      createTime: '2024-07-09 09:00:50'
-      sumQty:
-      sumAmount:
-      operationPkg: 0
+      createTime: '2024-07-09 11:37:11'
+      createUser: h0347_UID-051404
+      lastModifiedUser:
+      orderNo: CG2024070920928
+      billMode: '66'
+      recType: HDI
+      hosId: h0347
+      branchId: h0347-3738
+      deptId:
+      deptName:
+      recOrgId: 7b4d11aec57042e096684a46e9148fdd
+      recOrgName: 二级检验科002
+      areaCode:
+      areaName:
+      billExpdtDate:
+      sourceId: Ph034720240709028567
+      sourceType:
+      inSettlement:
+      recUser:
+      recPhone:
+      recAddr: 自动化测试
       provId: p1e332
       provName: 国药集团公司L1slG
-      subProvId: ''
-      subProvName: ''
-      recDeptId: 7b4d11aec57042e096684a46e9148fdd
+      subSendFlag:
+      exeProvId: p1e332
+      exeProvName: 国药集团公司L1slG
+      billRelationJson:
+      extInfo:
+      barcodeFlag: 1
+      pkgFlag:
+      remark: ''
+      priority:
+      closeStatus: 0
+      closeDate:
+      upStatus:
+      tbStatus: 30
+      hosVersion: 3
+      billType: CGD
+      hosName: 邹城市人民医院(test)
+      branchName: 东土城路院区8SpTq
+      sumQty: 100.0
+      sumPkgQty: 1.0
+      sumAmount: '9999.9900'
+      planOrderNo: PLAN2024070931922
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message9

 配送订单详细信息:
   list_a:
   - &id001
-    id: Nh034720240709000002
-    orderNo: SSTZ202407090309
-    sourceOrderNo: SSSQ202407090333
-    hosId: h0347
-    hosName: 邹城市人民医院(test)
-    branchName: 东土城路院区8SpTq
-    recDeptName: 二级检验科002
-    operName: 血管扩张术
-    operDate: '2024-07-10'
-    operDoctor: 李*
-    patientName: 张*
-    status: 20
-    statusText: 待配送
-    version: 1
-    patientInHosId: '123456'
-    surDeptName: ''
-    remark: 自动化测试
-    createUserName: 自动化测试lVbzF
-    distPriority: 0
-    distPriorityText: 否
-    distId:
-    distNo:
-    hosVersion: 3
-    createTime: '2024-07-09 09:00:50'
-    sumQty: 1
-    sumAmount: '99.9999'
-    operationPkg: 0
-    provId: p1e332
-    provName: 国药集团公司L1slG
-    subProvId: ''
-    subProvName: ''
-    recDeptId: 7b4d11aec57042e096684a46e9148fdd
-  list_b:
-  - *id001
-  list_c:
-  - *id001
-配送订单详细信息2:
-  list_a:
-  - &id001
-    - id: h034720240709000002
-      hosGoodsId: h034700004510
-      goodsNum: 1
+    - id: d4a7491724fe4cc999389fa90a61f8c0
+      lastModified:
+      version:
+      createTime:
+      createUser:
+      lastModifiedUser:
+      pid: Ch034720240709000102
+      orderNo: CG2024070920928
+      sourceId: 3a72d228422f4f6abf14c9129e4ea520
+      hosGoodsId: h034700004512
+      mdmGoodsCode: '11661465'
+      goodsCode: '00004512'
+      purMode: 60
       price: '99.9999'
-      inSettlement: 3
-      inSettlementText: 消耗结算
-      goodsName: 高值牙钻机Mm)84
-      goodsSpec: G-31891
-      goodsCode: '00004510'
-      goodsMfrsId: mfrs-11229
-      goodsMfrsName: 德国歌德公司 Geuder AG
+      supplyId: 6e75c97bc0f84967b819e9a210592d53
+      pkgDefId: 8ce905b956f14453b958d0da398c0350
+      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":"Ph034720240709028567","buyDetailId":"Bh034720240709000810001","planDetailId":"3a72d228422f4f6abf14c9129e4ea520"}'
+      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004512","purMode":60,"goodsName":"新型冠状病毒检测试剂t(I8N"}'
+      remark:
+      tbStatus:
+      hosVersion:
       unit: 支
-      subProvId: p1e332
-      subProvName: 国药集团公司L1slG
-      totalAmount: '99.9999'
-      spdGoodsCode: '11661463'
-      barCodeMng: 2
-      erpCode: '11661463'
+      goodsName: 新型冠状病毒检测试剂t(I8N
+      mfrsId: mfrs-11229
+      mfrsName: 德国歌德公司 Geuder AG
+      goodsGg: G-31891
+      mdmGoodsSpecCode: '11661465'
+      erpCode: '11661465'
+      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: '37380000045120'
       multiChargeFlag: 0
       useFrequency: 1
       chargeUnit:
-      hitCode: '12'
-      hitPrice: '99.999900'
-      diUse:
-      goodsDi: '01123456789012'
+      amount: '9999.9900'
+      unitName: 100支/100
+      subProvId: p1e332
+      subProvName: 国药集团公司L1slG
+      subPrice: 99.9999
+      replPkgQty: 1.0
+      replQty: 100.0
+      ybDefId:
+      logicId:
+      provGoodsId:
+      sendFlag:
+      curQry:
   list_b:
   - *id001
   list_c: