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

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
4efd8162 · 肖和生 · e009d8ea · 01888f18 · 4efd8162 · 4efd8162
Commit 4efd8162 authored Jul 25, 2024 by 肖和生
--- a/air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air/a_b5流程十二请领业务流_二级库向二级库.py
+++ b/air_case/b5_spd3_core_business_flow/a_b5流程十二请领业务流_二级库向二级库.air/a_b5流程十二请领业务流_二级库向二级库.py
@@ -213,6 +213,14 @@ def BuyCarSubmit():
    result = commonFuc().http_post(url, request_body, headers)
    print('创建领车交易,result', result)
    currentTaskList = commonFuc().analysis_json('currentTaskList', commonFuc().analysis_json('data', result))
+    businessNo_list=[]
+    for i in currentTaskList:
+        businessNo = commonFuc().analysis_json('businessNo', i)
+        businessNo_list.append(businessNo)
+    #将请领单号写入文件
+    info = (businessNo_list[0],businessNo_list[1],businessNo_list[2])
+    titlename = ('buy_NO1', 'buy_NO2','buy_NO3')
+    FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '二级库向二级库请领单号', titlename, 'message25')
 def add_dept2():
@@ -354,66 +362,85 @@ def pick_execute():
                                            commonFuc().get_business_data(module, "X-APP-CODE"))
    url1 = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                              "herpService_stock_out_buyPage_url")
-    print('请领出库列表页面=================', url1)
+    info=  FileUtils().r_info8('b5_spd3_core_business_flow', "二级库向二级库请领单号", 'message25')
-    request_body1 = commonFuc().get_business_data(module, "payload46_1", get_branch_id())
+    # print(info)
+    DRNo_list = []
-    print('请领出库列表页面', 'request_body', request_body1)
+    for i in range(1,4):
-    result1 = commonFuc().http_post(url1, request_body1, headers)
+        if i==1:
-    print('请领出库列表页面,result1', result1)
+            orderNo = info['buy_NO1']
-    data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result1))
+        elif i==2:
-    for i in data1:
+            orderNo = info['buy_NO2']
-        # 获取id
+        elif i==3:
-        BH_ID = commonFuc().analysis_json('id', i)
+            orderNo = info['buy_NO3']
-        version = commonFuc().analysis_json('version', i)
-        deptBuyDetailVOList = commonFuc().analysis_json('deptBuyDetailVOList', i)
-        purMode = commonFuc().analysis_json('purMode', deptBuyDetailVOList)
-        # 生成拣货单列表查询===============================================
-        # 生成拣货单列表锁定===============================================
-        url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
-                                                                                 "herpService_stock_out_use_updateLock_url")
-        print('请领出库列表列表页面锁定=================', url)
-        # version=int(version)+1
-        request_body = commonFuc().get_business_data(module, "payload49_1", BH_ID, version)
-        print('请领出库列表列表页面锁定', 'request_body', request_body)
-        result = commonFuc().http_post(url, request_body, headers)
-        print('请领出库列表列表页面锁定,result1', result)
-        # 生成拣货单列表锁定===============================================
-        # 拣货==============================
-        if purMode == 10:
-            udi_code = get_udi2(1)  # 获取条码 低值1 高值2 试剂3
-        elif purMode == 20:
-            udi_code = get_udi2(2)  # 获取条码 低值1 高值2 试剂3
-        elif purMode == 60:
-            udi_code = get_udi2(3)  # 获取条码 低值1 高值2 试剂3
-        else:
-            udi_code = 'udi_code'
-        print('udi_code', udi_code)
-        if purMode == 10:
-            targetAreaCode,sourceId=pickScan2(BH_ID, udi_code, 1)  # 低值
-        elif purMode == 20:
-            targetAreaCode,sourceId=pickScan2(BH_ID, udi_code, 2)  # 高值
-        elif purMode == 60:
-            targetAreaCode,sourceId= pickScan2(BH_ID, udi_code, 3)  # 试剂
        else:
-            targetAreaCode='targetAreaCode'
+            orderNo='orderNo'
-            sourceId='sourceId'
+        print('请领出库列表页面=================', url1)
-        # 提交领用出库单
+        request_body1 = commonFuc().get_business_data(module, "payload46_1", orderNo,get_branch_id())
-        url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
-                                                                                 "herpService_stock_out_use_submit_url")
+        print('请领出库列表页面', 'request_body', request_body1)
-        print('提交拣货执行单=================', url)
+        result1 = commonFuc().http_post(url1, request_body1, headers)
-        if purMode == 10:
+        print('请领出库列表页面,result1', result1)
-            request_body = commonFuc().get_business_data(module, "payload51_1_1", targetAreaCode,sourceId)
+        data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result1))
-        elif purMode == 20:
+        for i in data1:
-            request_body = commonFuc().get_business_data(module, "payload51_1_2", targetAreaCode,sourceId)
+            # 获取id
-        elif purMode == 60:
+            BH_ID = commonFuc().analysis_json('id', i)
-            request_body = commonFuc().get_business_data(module, "payload51_1_3", targetAreaCode,sourceId)
+            version = commonFuc().analysis_json('version', i)
+            deptBuyDetailVOList = commonFuc().analysis_json('deptBuyDetailVOList', i)
-        print('提交拣货执行单', 'request_body', request_body)
+            billMode = commonFuc().analysis_json('billMode', data1)
-        result = commonFuc().http_post(url, request_body, headers)
+            # 生成拣货单列表查询===============================================
-        print(' 提交拣货执行单,result1', result)
+            # 生成拣货单列表锁定===============================================
+            url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+                                                                                     "herpService_stock_out_use_updateLock_url")
+            print('请领出库列表列表页面锁定=================', url)
+            # version=int(version)+1
+            request_body = commonFuc().get_business_data(module, "payload49_1", BH_ID, version)
+            print('请领出库列表列表页面锁定', 'request_body', request_body)
+            result = commonFuc().http_post(url, request_body, headers)
+            print('请领出库列表列表页面锁定,result1', result)
+            # 生成拣货单列表锁定===============================================
+            # 拣货==============================
+            if billMode == '16':
+                udi_code = get_udi2(1)  # 获取条码 低值1 高值2 试剂3
+            elif billMode == '20':
+                udi_code = get_udi2(2)  # 获取条码 低值1 高值2 试剂3
+            elif billMode == '66':
+                udi_code = get_udi2(3)  # 获取条码 低值1 高值2 试剂3
+            else:
+                udi_code = 'udi_code'
+            print('udi_code', udi_code)
+            if billMode == '16':
+                targetAreaCode,sourceId=pickScan2(BH_ID, udi_code, 1)  # 低值
+            elif billMode == '20':
+                targetAreaCode,sourceId=pickScan2(BH_ID, udi_code, 2)  # 高值
+            elif billMode == '66':
+                targetAreaCode,sourceId= pickScan2(BH_ID, udi_code, 3)  # 试剂
+            else:
+                targetAreaCode='targetAreaCode'
+                sourceId='sourceId'
+            # 提交领用出库单
+            url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+                                                                                     "herpService_stock_out_use_submit_url")
+            print('提交拣货执行单=================', url)
+            if billMode == '16':
+                request_body = commonFuc().get_business_data(module, "payload51_1_1", targetAreaCode,sourceId)
+            elif billMode == '20':
+                request_body = commonFuc().get_business_data(module, "payload51_1_2", targetAreaCode,sourceId)
+            elif billMode == '66':
+                request_body = commonFuc().get_business_data(module, "payload51_1_3", targetAreaCode,sourceId)
+            print('提交拣货执行单', 'request_body', request_body)
+            result = commonFuc().http_post(url, request_body, headers)
+            print(' 提交拣货执行单,result1', result)
+            DR_id=commonFuc().analysis_json('data',result)
+            DRNo_list.append(DR_id)
+            # 将请领单号写入文件
+    info = (DRNo_list[0], DRNo_list[1], DRNo_list[2])
+    titlename = ('DR_NO1', 'DR_NO2', 'DR_NO3')
+    FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '拣货单id', titlename, 'message26')
 # 复核===================================

--- a/air_case/b6_spd3_core_business_flow_database_check/a_b3流程十请领业务流_二级库向边仓_数据库验证.air/a_b3流程十请领业务流_二级库向边仓_数据库验证.py
+++ b/air_case/b6_spd3_core_business_flow_database_check/a_b3流程十请领业务流_二级库向边仓_数据库验证.air/a_b3流程十请领业务流_二级库向边仓_数据库验证.py
@@ -183,7 +183,7 @@ def mcms_dept_buy_detail(type=16):
 def check_mcms_dept_buy(type=16):
    branch_id = get_branch_id()
-    sql = """select * from mcms_dept_buy where branch_id='%s' and bill_mode='%s' order by create_time desc  LIMIT 1;
+    sql = """select * from mcms_dept_buy where branch_id='%s' and bill_mode='%s' and buy_kind='KS' order by create_time desc  LIMIT 1;
                 """ % (branch_id, type)
    actual = check_mcms_dept_buy_sql(sql)
    print(actual)
@@ -236,6 +236,7 @@ def check_mcms_dept_buy(type=16):
        "select last_audit_time from  mcms_dept_buy where branch_id='%s' and bill_mode='%s' order by create_time desc  LIMIT 1;" % (
            branch_id, type))
    target_stock_name = '自动化测试12345'
+    # target_stock_name=get_branch_name()+'中心库房'
    rec_addr = deptname2
    if type == 16:
        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
@@ -334,6 +335,7 @@ def check_mcms_dept_buy_approval_after(type=16):
        "select last_audit_time from  mcms_dept_buy where branch_id='%s' and bill_mode='%s' order by create_time desc  LIMIT 1;" % (
            branch_id, type))
    target_stock_name = '自动化测试12345'
+    # target_stock_name = get_branch_name() + '中心库房'
    rec_addr = deptname2
    if type == 16:
        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
@@ -494,6 +496,7 @@ try:
    second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
    check_mcms_dept_buy_car(3)
    BuyCarSubmit()  # 请领车提交
+    time.sleep(8)
    # 调用函数对数据库中的数据进行验证和比对
    list_data = ['16', '20', '66']
    for i in list_data:

--- a/air_case/b6_spd3_core_business_flow_database_check/a_b5流程十二请领业务流_二级库向二级库_数据库验证.air/a_b5流程十二请领业务流_二级库向二级库_数据库验证.py
+++ b/air_case/b6_spd3_core_business_flow_database_check/a_b5流程十二请领业务流_二级库向二级库_数据库验证.air/a_b5流程十二请领业务流_二级库向二级库_数据库验证.py
@@ -5,7 +5,7 @@ import traceback
 from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
 from air_case.public1.public1.public1 import *
 from common.db.sql.sql_del_branch_info import delData
-from common.db.sql.sql_tools import get_create_time, check_mcms_dept_buy_car_sql
+from common.db.sql.sql_tools import *
 from common.fileUtls import FileUtils
 from common.run_cmd_script import execute_command
@@ -48,18 +48,15 @@ def check_mcms_dept_buy_car(type=1):
    # 要验证的sql，取自数据库的表中
    actual_value1 = check_mcms_dept_buy_car_sql(sql)
    print(actual_value1)
-    deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
+    deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5']
-    deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+    deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5']
    areaCode = get_stockAreaId_new_fromDb(deptname2, 2)
    areaName = '默认库区'
-    # 读取文件中的信息
-    info = FileUtils().r_info8('b5_spd3_core_business_flow', "二级库请领产品信息", 'message21')
+    mdm_goods_code = get_mdm_goods_code1(hos_goods_id)
-    list_a = info['list_a']
+    goodsCode = get_goods_code1(hos_goods_id)
-    mdm_goods_code = commonFuc().analysis_json('mdmGoodsCode', list_a)
+    pkgDefId = get_pkg_def_id(hos_goods_id)
-    pur_mode = commonFuc().analysis_json('purMode', list_a)
+    pkgDefName = get_pkg_def_Name(hos_goods_id)
-    goodsCode = commonFuc().analysis_json('goodsCode', list_a)
-    pkgDefId = commonFuc().analysis_json('pkgDefId', list_a)
-    pkgDefName = commonFuc().analysis_json('pkgDefName', list_a)
    last_modified_user = create_user
    last_modified = create_time
    # print('actual_value1',actual_value1)
@@ -68,21 +65,28 @@ def check_mcms_dept_buy_car(type=1):
    # print( actual_value2)
    # prov_hos_goods_id = '8d6273b7bca84dd8aace12b9422d7fd6'
    expected_value2 = 'expected_value2'
-    if type == 1 or type == 3:
+    if type == 1:
        expected_value2 = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                                        'check_mcms_dept_buy_car_low_value', id, get_hosid(), branch_id,
+                                                        'check_mcms_dept_buy_car', id, get_hosid(), branch_id,
                                                        deptid2,
                                                        deptname2, areaCode, areaName, hos_goods_id, mdm_goods_code,
-                                                        goodsCode, pur_mode, pkgDefId, pkgDefName
+                                                        goodsCode, pkgDefId, pkgDefName
                                                        , create_user, create_time, last_modified, last_modified_user)
    elif type == 2:
        expected_value2 = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                                        'check_mcms_dept_buy_car_high_value', id, get_hosid(),
+                                                        'check_mcms_dept_buy_car2', id, get_hosid(),
                                                        branch_id,
                                                        deptid2,
                                                        deptname2, areaCode, areaName, hos_goods_id, mdm_goods_code,
-                                                        goodsCode, pur_mode,
+                                                        goodsCode,
                                                        create_user, create_time, last_modified, last_modified_user)
+    else:
+        expected_value2 = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                        'check_mcms_dept_buy_car3', id, get_hosid(), branch_id,
+                                                        deptid2,
+                                                        deptname2, areaCode, areaName, hos_goods_id, mdm_goods_code,
+                                                        goodsCode, pkgDefId, pkgDefName
+                                                        , create_user, create_time, last_modified, last_modified_user)
    # print('expected_value2', expected_value2)
    # expected_value2=get_process_list2(expected_value2)
    actual_value2 = actual_value2.replace(" ", "")
@@ -101,6 +105,314 @@ def check_mcms_dept_buy_car(type=1):
        print('error')
        commonFuc().check_text_exist_result_text('error', 'succees')
+# 检查二级库请领单审批前的子表数据
+def mcms_dept_buy_detail(type=16):
+    branch_id = get_branch_id()
+    # 获取主表主键
+    sql = "select id from  mcms_dept_buy where branch_id='%s' and bill_mode='%s' order by create_time desc  LIMIT 1;" % (
+        branch_id, type)
+    id1 = process_tuple(get_dept_buy_id(sql))
+    # 获取order_no
+    sql1 = "select order_no from  mcms_dept_buy where branch_id='%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
+        branch_id, type)
+    order_no1 = get_dept_buy_id(sql1)
+    order_no1 = process_tuple(order_no1)
+    # 子表sql
+    sql1 = "select * from mcms_dept_buy_detail where pid='%s';" % id1
+    # 从数据库中获取实际值
+    actual = check_mcms_dept_buy_sql(sql1)
+    print('actual', actual)
+    if type == 16:
+        hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
+    elif type == 20:
+        hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message1')["hosGoodsId"]
+    else:
+        hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message3')["hosGoodsId"]
+    # print(hos_goods_id,process_tuple(hos_goods_id))
+    # 获取子表id
+    detail_id = get_id("select id from mcms_dept_buy_detail where pid='%s';" % id1)
+    print('detail_id', detail_id)
+    info = FileUtils().r_info8('b5_spd3_core_business_flow', "二级库请领产品信息", 'message21')
+    list_a = info['list_a']
+    mdm_goods_code = process_tuple(
+        get_mdm_goods_code("select mdm_goods_code from mcms_goods_info  where id='%s';" % hos_goods_id))
+    goods_code = process_tuple(
+        get_mdm_goods_code("select hos_goods_code from mcms_goods_info  where id='%s';" % hos_goods_id))
+    pkg_def_id = process_tuple(
+        get_id("select pkg_def_id from mcms_pkg where hos_goods_id='%s' LIMIT 1;" % hos_goods_id))
+    if pkg_def_id == 'None':
+        print(pkg_def_id)
+        pkg_def_id = pkg_def_id.replace("'", "")
+        print(pkg_def_id)
+    pkg_def_name = process_tuple(
+        get_id("select pkg_def_name from mcms_pkg where hos_goods_id='%s' LIMIT 1;" % hos_goods_id))
+    create_user = get_login_user_uxid()
+    create_time = get_create_time("select create_time from  mcms_dept_buy_detail where pid='%s';" % id1)
+    last_modified = create_time
+    last_modified_user = create_user
+    if type == 16:
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_dept_buy_detail', detail_id, id1, order_no1, hos_goods_id,
+                                                 mdm_goods_code, goods_code, pkg_def_id, pkg_def_name, create_user,
+                                                 create_time, last_modified, last_modified_user)
+    elif type == 20:
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_dept_buy_detail1', detail_id, id1, order_no1, hos_goods_id,
+                                                 mdm_goods_code, goods_code, pkg_def_id, pkg_def_name, create_user,
+                                                 create_time, last_modified, last_modified_user)
+    else:
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_dept_buy_detail2', detail_id, id1, order_no1, hos_goods_id,
+                                                 mdm_goods_code, goods_code, pkg_def_id, pkg_def_name, create_user,
+                                                 create_time, last_modified, last_modified_user)
+    actual_value1 = get_process_list2(actual)
+    expected_value1 = get_process_list2(expected)
+    actual_value2 = actual_value1.replace(" ", "")
+    expected_value2 = expected_value1.replace(" ", "")
+    # print('actual_value2',actual_value2)
+    print('expected_value2')
+    print(expected_value2)
+    print('actual_value2')
+    print(actual_value2)
+    result = (compare_text_index(actual_value2, expected_value2))
+    print('result', result)
+    if actual_value2 == expected_value2:
+        print('ok')
+        commonFuc().check_text_exist_result_text('succees', 'succees')
+    else:
+        print('error')
+        commonFuc().check_text_exist_result_text('error', 'succees')
+# 检查二级库请领单审批前的主表数据
+def check_mcms_dept_buy(type=16):
+    branch_id = get_branch_id()
+    sql = """select * from mcms_dept_buy where branch_id='%s' and bill_mode='%s' and buy_kind='LY' order by create_time desc  LIMIT 1;
+                 """ % (branch_id, type)
+    actual = check_mcms_dept_buy_sql(sql)
+    print(actual)
+    # 获取主键id
+    sql = "select id from  mcms_dept_buy where branch_id='%s' and bill_mode='%s' order by create_time desc  LIMIT 1;" % (
+        branch_id, type)
+    id1 = get_dept_buy_id(sql)
+    # 获取order_no
+    sql1 = "select order_no from  mcms_dept_buy where branch_id='%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
+        branch_id, type)
+    order_no1 = get_dept_buy_id(sql1)
+    print(process_tuple(id1), process_tuple(order_no1))
+    id1 = process_tuple(id1)
+    order_no1 = process_tuple(order_no1)
+    deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5']
+    deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5']
+    deptname5 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+    target_stock_name = deptname5 + "库房"
+    # target_dept_id=FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid1']
+    # area_code = get_stockAreaId_new(deptid2, deptname2, 2)
+    # info = FileUtils().r_info8("b5_spd3_core_business_flow", "库区信息", 'message22')
+    # list_a = info['list_a']
+    area_code = get_stockAreaId_new_fromDb(deptname2, 2)
+    area_name = '默认库区'
+    # 读取文件中的信息
+    info = FileUtils().r_info8('b5_spd3_core_business_flow', "二级库向二级库请领产品信息", 'message23')
+    list_a = info['list_a']
+    target_dept_id = commonFuc().analysis_json('targetDeptId', list_a)
+    target_dept_name = commonFuc().analysis_json('targetDeptName', 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)
+    bill_expdt_date = get_expdt_date(
+        "select bill_expdt_date from  mcms_dept_buy where branch_id='%s' and bill_mode='%s' order by create_time desc  LIMIT 1;" % (
+            branch_id, type))
+    rec_user = get_login_user_uxid()
+    # rec_addr='二级检验科002'
+    create_user = rec_user
+    create_time = get_create_time(
+        "select create_time from  mcms_dept_buy where branch_id='%s' and bill_mode='%s' order by create_time desc  LIMIT 1;" % (
+            branch_id, type))
+    last_modified = get_create_time(
+        "select last_modified from  mcms_dept_buy where branch_id='%s' and bill_mode='%s' order by create_time desc  LIMIT 1;" % (
+            branch_id, type))
+    last_modified_user = rec_user
+    last_auditor = rec_user
+    last_audit_time = get_create_time(
+        "select last_audit_time from  mcms_dept_buy where branch_id='%s' and bill_mode='%s' order by create_time desc  LIMIT 1;" % (
+            branch_id, type))
+    rec_addr = deptname2
+    dept_id1 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
+    dept_name1=FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+    stock_name = dept_name1 + "库房"
+    target_stock_id = get_stockId_fromdb(stock_name)
+    if type == 16:
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_dept_buy5', id1, order_no1, get_hosid(), branch_id,
+                                                 deptid2,
+                                                 deptname2, area_code, area_name, target_dept_id, target_dept_name,
+                                                 target_stock_id, target_stock_name, bill_expdt_date, rec_user,
+                                                 rec_addr, create_user, create_time,
+                                                 last_modified, last_modified_user)
+    elif type == 20:
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_dept_buy5_2', id1, order_no1, get_hosid(),
+                                                 branch_id, deptid2,
+                                                 deptname2, area_code, area_name, target_dept_id, target_dept_name,
+                                                 target_stock_id, target_stock_name, bill_expdt_date, rec_user,
+                                                 rec_addr, create_user, create_time,
+                                                 last_modified, last_modified_user)
+    else:
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_dept_buy5_3', id1, order_no1, get_hosid(),
+                                                 branch_id, deptid2,
+                                                 deptname2, area_code, area_name, target_dept_id, target_dept_name,
+                                                 target_stock_id, target_stock_name, bill_expdt_date, rec_user,
+                                                 rec_addr, create_user, create_time,
+                                                 last_modified, last_modified_user)
+    print('expected', expected)
+    print('aaaaaaaaaaaaaaaaa')
+    actual_value1 = get_process_list2(actual)
+    expected_value1 = get_process_list2(expected)
+    actual_value2 = actual_value1.replace(" ", "")
+    expected_value2 = expected_value1.replace(" ", "")
+    # print('actual_value2',actual_value2)
+    print('expected_value2')
+    print(expected_value2)
+    print('actual_value2')
+    print(actual_value2)
+    print(compare_text_index(actual_value2, expected_value2))
+    if actual_value2 == expected_value2:
+        print('ok')
+        commonFuc().check_text_exist_result_text('succees', 'succees')
+    else:
+        print('error')
+        commonFuc().check_text_exist_result_text('error', 'succees')
+def check_mcms_psi_dept_batch(type,DR_ID):
+    sql = " select * from  mcms_psi_dept_batch where pid='%s';" % (
+    DR_ID)
+    actual = check_mcms_dept_buy_sql(sql)
+    print(actual)
+    if type == 16:
+        #子表检查
+        check_mcms_psi_dept_batch(type,DR_ID)
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_psi_dept1',DR_ID
+                                                 )
+    elif type == 20:
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_psi_dept2',DR_ID)
+    else:
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_psi_dept3',DR_ID)
+    print('expected', expected)
+    print('aaaaaaaaaaaaaaaaa')
+    actual_value1 = get_process_list2(actual)
+    expected_value1 = get_process_list2(expected)
+    actual_value2 = actual_value1.replace(" ", "")
+    expected_value2 = expected_value1.replace(" ", "")
+    # print('actual_value2',actual_value2)
+    print('expected_value2')
+    print(expected_value2)
+    print('actual_value2')
+    print(actual_value2)
+    print(compare_text_index(actual_value2, expected_value2))
+    if actual_value2 == expected_value2:
+        print('ok')
+        commonFuc().check_text_exist_result_text('succees', 'succees')
+    else:
+        print('error')
+        commonFuc().check_text_exist_result_text('error', 'succees')
+def check_mcms_psi_dept(type=16):
+    branch_id=get_branch_id()
+    sql=" select * from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='CK_SL' order by   CREATE_TIME desc LIMIT 1;"%(branch_id,type)
+    actual = check_mcms_dept_buy_sql(sql)
+    print(actual)
+    info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单id", 'message26')
+    # print(info)
+    if type==16:
+        DR_ID=info['DR_NO2']
+    elif type==20:
+        DR_ID = info['DR_NO3']
+    else:
+        DR_ID = info['DR_NO1']
+    DR_ID = ''.join(DR_ID)
+    sql="select order_no from mcms_psi_dept where id='%s';"% DR_ID
+    order_no = get_id(sql)
+    target_corp_id=get_hosid()
+    target_branch_id=get_branch_id()
+    target_dept_id=FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5']
+    target_dept_name=FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5']
+    target_stock_id=get_stockId_fromdb(target_dept_name+'库房')
+    target_area_code=get_stockAreaId_new_fromDb(target_dept_name,2)
+    PICK_id=get_PICK_id(branch_id,type)
+    source_id=PICK_id
+    source_corp_id=get_hosid()
+    source_branch_id=get_branch_id()
+    source_dept_id=FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
+    source_dept_name=FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+    source_stock_id=get_stockId_fromdb(source_dept_name+'库房')
+    source_area_code=get_stockAreaId_new_fromDb(source_dept_name,2)
+    buyBillId =get_buyBillId(branch_id,type)
+    pickOrderNo=get_PICK_order_no(branch_id,type)
+    buyOrderNo=get_buyOrderNo(branch_id,type)
+    pickBillId=get_PICK_id(branch_id,type)
+    psiDeptOutBillId=DR_ID
+    psiDeptOutOrderNo=order_no
+    create_user=get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
+    create_time=get_create_time("select create_time from  mcms_psi_dept where id='%s';" % DR_ID)
+    last_modified=get_create_time("select last_modified from  mcms_psi_dept where id='%s';" % DR_ID)
+    last_modified_user=create_user
+    if type == 16:
+        #子表检查
+        check_mcms_psi_dept_batch(type,DR_ID)
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_psi_dept1',DR_ID,order_no,target_corp_id,target_branch_id,target_dept_id,target_dept_name,target_stock_id
+                                                    ,target_area_code,source_id,source_corp_id,source_branch_id,
+                                                 source_dept_id,source_dept_name,source_stock_id,source_area_code,
+                                                 buyBillId,pickOrderNo,buyOrderNo,pickBillId,psiDeptOutBillId,psiDeptOutOrderNo
+                                                ,create_user,create_time,last_modified,last_modified_user
+                                                 )
+    elif type == 20:
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_psi_dept2',DR_ID,order_no,target_corp_id,target_branch_id,target_dept_id,target_dept_name,target_stock_id
+                                                    ,target_area_code,source_id,source_corp_id,source_branch_id,
+                                                 source_dept_id,source_dept_name,source_stock_id,source_area_code,
+                                                 buyBillId,pickOrderNo,buyOrderNo,pickBillId,psiDeptOutBillId,psiDeptOutOrderNo
+                                                ,create_user,create_time,last_modified,last_modified_user)
+    else:
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_psi_dept3',DR_ID,order_no,target_corp_id,target_branch_id,target_dept_id,target_dept_name,target_stock_id
+                                                    ,target_area_code,source_id,source_corp_id,source_branch_id,
+                                                 source_dept_id,source_dept_name,source_stock_id,source_area_code,
+                                                 buyBillId,pickOrderNo,buyOrderNo,pickBillId,psiDeptOutBillId,psiDeptOutOrderNo
+                                                ,create_user,create_time,last_modified,last_modified_user)
+    print('expected', expected)
+    print('aaaaaaaaaaaaaaaaa')
+    actual_value1 = get_process_list2(actual)
+    expected_value1 = get_process_list2(expected)
+    actual_value2 = actual_value1.replace(" ", "")
+    expected_value2 = expected_value1.replace(" ", "")
+    # print('actual_value2',actual_value2)
+    print('expected_value2')
+    print(expected_value2)
+    print('actual_value2')
+    print(actual_value2)
+    print(compare_text_index(actual_value2, expected_value2))
+    if actual_value2 == expected_value2:
+        print('ok')
+        commonFuc().check_text_exist_result_text('succees', 'succees')
+    else:
+        print('error')
+        commonFuc().check_text_exist_result_text('error', 'succees')
 try:
    pro_path = commonFuc().get_pro_path2()
    print('pro_path', pro_path)
@@ -111,52 +423,66 @@ try:
    from a_b5流程十二请领业务流_二级库向二级库 import add_new_deptinfo,edit_goods_target,second_dept_Request
    from a_b5流程十二请领业务流_二级库向二级库 import BuyCarSubmit,pick_execute
-    from a_b5流程十二请领业务流_二级库向二级库 import purchase_module_process
+    #========下面暂时注释
-    from a_b5流程十二请领业务流_二级库向二级库 import order_dp
+    # add_dept2()  # 新增一个二级科室
-    from a_b5流程十二请领业务流_二级库向二级库 import check_accept_order
+    # add_new_deptinfo()  # 写入科室信息到文件中
-    add_dept2()  # 新增一个二级科室
+    # grants_user_new()  # 新增授权
-    add_new_deptinfo()  # 写入科室信息到文件中
+    # # 同步库房信息
-    grants_user_new()  # 新增授权
+    # execute_command("python runner_test.py tag id2263-221 debug sit")
-    # 同步库房信息
+    # # 设置部门用户
-    execute_command("python runner_test.py tag id2263-221 debug sit")
+    # set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'],
-    # 设置部门用户
+    #               FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2)
-    set_dept_user(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'],
+    # # 设置部门负责人
-                  FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2)
+    # set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"])  # 设置二级科室负责人
-    # 设置部门负责人
+    # get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'],
-    set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"])  # 设置二级科室负责人
+    #                     FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2)
-    get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'],
+    #
-                        FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5'], 2)
+    # # 设置库区联系人
+    # deptName5 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5']
-    # 设置库区联系人
+    #
-    deptName5 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5']
+    # set_stockShelf_Linkman(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"],
+    #                        get_stockAreaId2_new_fromDb(deptName5, 2))
-    set_stockShelf_Linkman(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid5"],
+    # #新建科室产品分配
-                           get_stockAreaId2_new_fromDb(deptName5, 2))
+    # dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'])
-    #新建科室产品分配
+    # #编辑产品请领目标为二级检验科002
-    dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5'])
+    # currentDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5']
-    #编辑产品请领目标为二级检验科002
+    # targetDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
-    currentDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5']
+    # edit_goods_target(currentDeptId, targetDeptId)
-    targetDeptId = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
+    #
-    edit_goods_target(currentDeptId, targetDeptId)
+    # updateUserLoginDefaultRange(get_listUserMgrRangePage1(5))  # 设置登录账号默认权限是新二级库
+    #
-    updateUserLoginDefaultRange(get_listUserMgrRangePage1(5))  # 设置登录账号默认权限是新二级库
    # # # 低值
-    second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
+    # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
-    check_mcms_dept_buy_car(1)
+    # check_mcms_dept_buy_car(1)
-    # # # 高值
+    # # # # 高值
-    second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
+    # 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)
+    # # # # 试剂
-    BuyCarSubmit()  # 请领车提交
+    # second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
-    for i in range(6):  # 三个单据共审批6次
+    # check_mcms_dept_buy_car(3)
-        approval_center()
+    #
-    updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))  # 设置登录账号默认权限是二级库
+    # BuyCarSubmit()  # 请领车提交
-    # 二级科室领用出库
+    # time.sleep(6)
-    # 低值拣货执行
+    # list_data = ['16', '20', '66']
-    pick_execute()
+    # for i in list_data:
+    #     check_mcms_dept_buy(int(i))
+    #     mcms_dept_buy_detail(int(i))
+    # for i in range(6):  # 三个单据共审批6次
+    #     approval_center()
+    # updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))  # 设置登录账号默认权限是二级库
+    # # # 二级科室领用出库
+    # # # 低值拣货执行
+    # pick_execute()
+    # 上面暂时注释========================
+    #检查出库单
+    # check_mcms_psi_dept(16)
+    # check_mcms_psi_dept(20)
+    check_mcms_psi_dept(66)
    second_dept_one_key_in(5)
    second_dept_one_key_in(5)
    second_dept_one_key_in(5)
    commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
+except Exception as e:
+    # 打印错误信息
+    print(f"发生错误: {e}")
    commonFuc().check_text_exist_result_text('error', '1')
--- a/air_case/public1/public1/public1.py
+++ b/air_case/public1/public1/public1.py
@@ -2732,6 +2732,8 @@ def pickScan2(PICK_ID, udi_code, type=1):  # 二级库出库拣货扫码
    code=commonFuc().analysis_json('code',result)
    if code==0:
        print('拣货扫码','ok')
+    elif code==14030001:
+        print('单据已被扫码，请刷新页面数据', 'ok')
    else:
        commonFuc().check_text_exist_result_text('error', 'succees')
    print('result', result)

--- a/common/db/sql/sql_tools.py
+++ b/common/db/sql/sql_tools.py
@@ -169,6 +169,20 @@ def get_id(sql):
    # print(new_str1)
    cursor.close()
    return new_str1
+def get_login_user_uxid_bydb(username):
+    db, cursor = get_sql_conn()
+    cursor.execute("select id from sys_user where user_code='%s'"%username)
+    results = cursor.fetchone()
+    str1 = str(results)
+    new_str1 = str1.replace(',)', '')
+    new_str1 = new_str1.replace('(', '')
+    new_str1 = new_str1.replace(',', '')
+    new_str1 = new_str1.replace("'", '')
+    # print(new_str1)
+    cursor.close()
+    return new_str1
 def get_dept_buy_id(sql):
    db, cursor = get_sql_conn()
    cursor.execute(sql)
@@ -218,6 +232,12 @@ def get_pkg_def_id(hos_goods_id):
    results = cursor.fetchone()
    cursor.close()
    return process_tuple(results)
+def get_pkg_def_Name(hos_goods_id):
+    db, cursor = get_sql_conn()
+    cursor.execute("select pkg_def_name from mcms_pkg where hos_goods_id='%s'" % hos_goods_id)
+    results = cursor.fetchone()
+    cursor.close()
+    return process_tuple(results)
 def get_goods_name1(hos_goods_id):
    db, cursor = get_sql_conn()
    cursor.execute("select goods_name from mcms_goods_info where id='%s'" % hos_goods_id)
@@ -247,6 +267,17 @@ def check_source_id(hos_goods_id,source_id):
        return  True
    else:
        return  False
+def get_PICK_id(branch_id,bill_mode):
+    sql = "select id from  mcms_pick  where branch_id='%s' and bill_mode='%s' order by   CREATE_TIME desc LIMIT 1;" % (
+        branch_id, bill_mode)
+    print(sql)
+    return process_tuple(get_dept_buy_id(sql))
+def get_PICK_order_no(branch_id,bill_mode):
+    PICK_id=get_PICK_id(branch_id,bill_mode)
+    sql = "select order_no from  mcms_pick  where id='%s' order by   CREATE_TIME desc LIMIT 1;" % (
+        PICK_id)
+    print(sql)
+    return process_tuple(get_dept_buy_id(sql))
 def get_buyBillId(branch_id,bill_mode):
    sql = "select id from  spd3_herp_test2.mcms_dept_buy where branch_id='%s' and bill_mode='%s' order by create_time desc  LIMIT 1;" % (
        branch_id, bill_mode)

--- a/data/a6_mdm3_si/message
+++ b/data/a6_mdm3_si/message
@@ -2,45 +2,45 @@
  list_a:
  - &id001
    settleMonth: '202407'
-    pid: OBh0347202407120006
+    pid: OBh0347202407120008
    hosGoodsId: h034700004547
    goodsCode: '00004547'
    goodsName: 一次性注射器_低值gV9^n
    goodsGg: G-31891
    mfrsName: 德国歌德公司 Geuder AG
    unit: 支
-    leftSettleAmount: 19999.98
+    leftSettleAmount: 0.0
    batchCode:
    kindName:
    factName:
    cacheleftAmount: 19999.98
    purMode: 10
-    waitInvoicingNum: 200.0
+    waitInvoicingNum: 0.0
    invoicingPrice:
    normalContractId:
    normalContract: '1'
    detailList:
-    - pid: OBh0347202407120006
+    - pid: OBh0347202407120008
      settleMonth: '202407'
      accountDate: '2024-07-12'
      hosGoodsId: h034700004547
      batchCode: '333'
-      distrDetailId: '03839656'
+      distrDetailId: '03839609'
-      distrId: PSh0347202407120049
+      distrId: PSh0347202407120002
-      distrOrderNo: PSh0347202407120049
+      distrOrderNo: PSh0347202407120002
      settlePrice: 99.9999
-      maxSettleQty: 100.0
+      maxSettleQty: -100.0
-      maxSettleAmount: 9999.99
+      maxSettleAmount: -9999.99
-      curSettleQty: 100.0
+      curSettleQty: -100.0
-      curSettleAmount: 9999.99
+      curSettleAmount: -9999.99
-      leftSettleQty: 100.0
+      leftSettleQty: -100.0
-      leftSettleAmount: 9999.99
+      leftSettleAmount: -9999.99
      hosId: h0347
      provId: p1e34a
      branchId: h0347-3745
-      balanceDetId: OBh0347202407120006-000001
+      balanceDetId: OBh0347202407120008-000001
      purMode: 10
-      barCode: '0101123456789012103331124071217250118241100000142024071200002344'
+      barCode: '0101123456789012103331124071217250118241100000142024071200000005'
      batchId:
      price:
      maxQty:
@@ -53,15 +53,15 @@
      volumeFlag:
      onlineKind:
      invoicePrice: 99.9999
-      viewId: 202407OBh0347202407120006h034700004547
+      viewId: 202407OBh0347202407120008h034700004547
-    - pid: OBh0347202407120006
+    - pid: OBh0347202407120008
      settleMonth: '202407'
      accountDate: '2024-07-12'
      hosGoodsId: h034700004547
      batchCode: '333'
-      distrDetailId: '03839653'
+      distrDetailId: '03839644'
-      distrId: PSh0347202407120046
+      distrId: PSh0347202407120037
-      distrOrderNo: PSh0347202407120046
+      distrOrderNo: PSh0347202407120037
      settlePrice: 99.9999
      maxSettleQty: 100.0
      maxSettleAmount: 9999.99
@@ -72,9 +72,9 @@
      hosId: h0347
      provId: p1e34a
      branchId: h0347-3745
-      balanceDetId: OBh0347202407120006-000002
+      balanceDetId: OBh0347202407120008-000002
      purMode: 10
-      barCode: '0101123456789012103331124071217250118241100000142024071200002341'
+      barCode: '0101123456789012103331124071217250118241100000142024071200002332'
      batchId:
      price:
      maxQty:
@@ -87,10 +87,10 @@
      volumeFlag:
      onlineKind:
      invoicePrice: 99.9999
-      viewId: 202407OBh0347202407120006h034700004547
+      viewId: 202407OBh0347202407120008h034700004547
-    unique: 202407OBh0347202407120006h034700004547
+    unique: 202407OBh0347202407120008h034700004547
    onlineKind: '10'
-    viewId: 202407OBh0347202407120006h034700004547
+    viewId: 202407OBh0347202407120008h034700004547
  list_b:
  - *id001
  list_c:

--- a/data/b5_spd3_core_business_flow/data
+++ b/data/b5_spd3_core_business_flow/data
@@ -149,7 +149,7 @@ json_headers2: {
 "payload45": {"dtos":"%s","opinion":1}
 "payload46": {"pageNum":1,"pageSize":50,"queryObject":{"deptId":"","auditStartTime":null,"auditEndTime":null,"startBillExpectDate":null,"endBillExpectDate":null,"priorityList":[],"orderNo":"","keyword":"","goodsSpec":"","shelfName":"","address":""}}
-"payload46_1": {"pageNum":1,"pageSize":50,"queryObject":{"orderNo":"","priorityList":[],"branchId":"%s"}}
+"payload46_1": {"pageNum":1,"pageSize":50,"queryObject":{"orderNo":"%s","priorityList":[],"branchId":"%s"}}
 "payload47": {"generateAll":false,"ids":["%s"],"allBillFlag":0}
 "payload48": {"pageNum":1,"pageSize":50,"queryObject":{"pickType":"KS","id":"","pickerName":"","targetDeptName":"","priorityList":[],"areaCode":"","keyword":"%s","goodsSpec":""}}

--- a/data/b5_spd3_core_business_flow/message10
+++ b/data/b5_spd3_core_business_flow/message10
@@ -7,3 +7,6 @@
 试剂配送单号:
  distrBillId1: PSh0347202407120063
  distrBillId2: PSh0347202407120063
+高值跟台配送单号:
+  distrBillId1: PSh0347202407120066
+  distrBillId2: PSh0347202407120066
--- a/data/b5_spd3_core_business_flow/message11
+++ b/data/b5_spd3_core_business_flow/message11
 采购计划单号高值:
-  orderNo1: PLAN2024071232521
+  orderNo1: PLAN2024071232519
-  orderNo2: PLAN2024071232521
+  orderNo2: PLAN2024071232519
--- a/data/b5_spd3_core_business_flow/message12
+++ b/data/b5_spd3_core_business_flow/message12
 采购计划单号试剂:
-  orderNo1: PLAN2024071232522
+  orderNo1: PLAN2024071232527
-  orderNo2: PLAN2024071232522
+  orderNo2: PLAN2024071232527
--- a/data/b5_spd3_core_business_flow/message13
+++ b/data/b5_spd3_core_business_flow/message13
@@ -8,29 +8,28 @@
      taskType: 1
      sourceOrgId: p1e34a
      sourceOrgName: 国药集团公司BCJj3
-      sourceOrderNo: PSh0347202407120063
+      sourceOrderNo: PSh0347202407120066
-      billMode: '66'
+      billMode: '25'
      stockKind:
      purMode:
-      sourceId: PSh0347202407120063
+      sourceId: PSh0347202407120066
      sourceDetailId:
      sourceType: PSD
      sourceTypeName: 配送单
      sourceVersion: 1
-      planOrderNo: PLAN2024071232522
+      planOrderNo: SSSQ202407120341
-      purOrderNo: CG2024071221204
+      purOrderNo: SSTZ202407120319
-      recOrgId: b82f526b0c4c438c95ccafd8a07d3af6
+      recOrgId: e6a7862c7b3d49a69ab93979a8f32710
-      recOrgName: 设备科001
+      recOrgName: 二级检验科002
-      billRelationJson: '{"planBillId":"Ph034720240712029167","planOrderNo":"PLAN2024071232522","purOrderNo":"CG2024071221204","purBillId":"Ch034720240712000091","purBillDate":"2024-07-12
+      billRelationJson: '{"operationApplyOrderNo":"SSSQ202407120341","operationNoticeBillId":"Nh034720240712000002","distrBillId":"PSh0347202407120066","operationNoticeOrderNo":"SSTZ202407120319","distrOrderNo":"PSh0347202407120066","operationApplyBillId":"Oh034720240712000002"}'
-        11:17:11","distrBillId":"PSh0347202407120063","distrOrderNo":"PSh0347202407120063"}'
+      taskDate: '2024-07-12 11:25:51'
-      taskDate: '2024-07-12 11:17:51'
      taskDateStart:
      taskDateEnd:
      billModeList:
      viewIdList:
      supplierFlag: false
      tbStatus: 20
-      remark: ''
+      remark:
      pdaFlag:
  list_b:
  - *id001

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

--- a/data/b5_spd3_core_business_flow/message15
+++ b/data/b5_spd3_core_business_flow/message15
 验收单号:
-  CHECK_NO1: CHECKh03472024071200056
+  CHECK_NO1: CHECKh03472024071200059
-  CHECK_NO2: CHECKh03472024071200056
+  CHECK_NO2: CHECKh03472024071200059
--- a/data/b5_spd3_core_business_flow/message18
+++ b/data/b5_spd3_core_business_flow/message18
 条码信息:
  list_a:
  - &id001
-    - id: '100000142024071200000004'
+    id: '100000142024071200000006'
-      lastModified:
+    snCode: '100000142024071200000006'
-      version:
+    ssccCode: '010839000189392425'
-      createTime: '2024-07-12 08:05:09'
+    pkgCodeSee: '0101123456789012103331124071217250118241100000142024071200000006'
-      createUser:
+    hosGoodsId: h034700004547
-      lastModifiedUser:
+    hosGoodsCode: '00004547'
-      snCode: '100000142024071200000004'
+    goodsCode: '00004547'
-      hosId: h0347
+    goodsName: 一次性注射器_低值gV9^n
-      branchId:
+    goodsSpec: G-31891
-      stockId: 49c401cc82704c7f8c9d110ff39e9106
+    goodsMfrsName: 德国歌德公司 Geuder AG
-      areaCode: areah03472727
+    unit: 支
-      areaName: 自动化测试
+    purMode: 10
-      shelfCode: areah03472727-2-01-01
+    batchCode: '333'
-      codeType: 16
+    productDate: '2024-07-12'
-      tagType: 0
+    expdtDate: '2025-01-18'
-      hosGoodsId: h034700004547
+    pkgDefName: '100'
-      mdmGoodsCode: '11661506'
+    pkgDefQty: 100.0
-      goodsCode: '00004547'
+    stockId: 49c401cc82704c7f8c9d110ff39e9106
-      goodsDi: '01123456789012'
+    stockName: 东土城路院区&BvGU中心库房
-      barName: 100支/100
+    areaName: 自动化测试
-      batchCode: '333'
+    areaCode: areah03472727
-      expdtDate: '2025-01-18'
+    lockStatus: 0
-      productDate: '2024-07-12'
+    unitName: 100支/100
-      mfrCode:
+    shelfCode: areah03472727-2-01-01
-      mfrCodeSee:
+    shelfNo: 自动化测试-2-01-01
-      pkgCode: "010112345678901210333\x1D1124071217250118241100000142024071200000004"
+    pkgDefId: 78dc0eecc5f64150b0d98f3a2c367734
-      pkgCodeSee: '0101123456789012103331124071217250118241100000142024071200000004'
+    extInfo: '{"pkgDefId": "78dc0eecc5f64150b0d98f3a2c367734", "pkgDefQty": 100, "purBillId":
-      ssccCode: '010839000189392227'
+      "CG2024071221144", "pkgDefName": "100", "distrBillId": "PSh0347202407120002",
-      extInfo:
+      "inStockTime": "2024-07-12 08:07:55", "distrDetailId": "03839609", "certificateCode":
-      outId:
+      ""}'
-      tbStatus: 20
+    bottleId:
-      goodsCodeDi:
+    pkgType: '16'
-      barcodeId:
+    miDjmc: ''
-      ext:
+    miCode: ''
-        pkgDefId: 78dc0eecc5f64150b0d98f3a2c367734
+    transferRatio: 1.0
-        pkgDefQty: 100
+    qty: 1
-        purBillId: CG2024071221144
+    shelfKind: 0
-        pkgDefName: '100'
+    shelfKindName: 普通货位
-        distrBillId: PSh0347202407120002
+    provName: 国药集团公司BCJj3
-        inStockTime: '2024-07-12 08:07:55'
+    provId: p1e34a
-        distrDetailId: '03839609'
+    inStockDate:
-        certificateCode: ''
+    mfrCode:
-      sourceDetailId:
+    made: 德国
-      purMode: 10
+    price:
-      purModes:
+    barName: 100支/100
-      price:
+    purModeText: 低值耗材
-      pid:
+    codeType: 16
-      goodsMfrsName: 德国歌德公司 Geuder AG
-      mfrsName:
-      goodsSpec: G-31891
-      unit: 支
-      goodsName: 一次性注射器_低值gV9^n
-      pkgDefId: 78dc0eecc5f64150b0d98f3a2c367734
-      pkgDefQty: 100
-      defaultPkgDefQty:
-      defaultQty:
-      defaultSurplusQty:
-      defaultPkgDefId:
-      purDetailId:
-      pkgDefName: '100'
-      printNum: 0
-      deptId:
-      deptName:
-      billId:
-      taskId:
-      made: 德国
-      provId: p1e34a
-      provName: 国药集团公司BCJj3
-      subProvId: p1e34a
-      subProvName: 国药集团公司BCJj3
-      provHosGoodsId:
-      sourceType:
-      taskDate:
-      sourceOrderNo:
-      taskType:
-      detailId:
-      branchGoodsPkgDefList:
-      unitName:
-      areaCodeList:
-      diType:
-      mdmGoodsSpecCode:
-      hosGoodsCode: '00004547'
-      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:
-      subSendFlag: 10
  list_b:
  - *id001
  list_c:

--- a/data/b5_spd3_core_business_flow/message20
+++ b/data/b5_spd3_core_business_flow/message20
 二级库条码信息:
  list_a:
  - &id001
-    id: '100000142024071200000301'
+    id: '100000142024071200002733'
-    snCode: '100000142024071200000301'
+    snCode: '100000142024071200002733'
-    ssccCode: '010839000189421927'
+    ssccCode: '010839000189665123'
-    pkgCodeSee: '01000000000045461022221124071217250118241100000142024071200000301'
+    pkgCodeSee: '01000000000045461022221124071217250118241100000142024071200002733'
    hosGoodsId: h034700004546
    hosGoodsCode: '00004546'
    goodsCode: '00004546'
@@ -27,8 +27,8 @@
    shelfCode: areah03472726-A-01-01
    shelfNo: A01-A-01-01
    pkgDefId:
-    extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202407120005", "inStockTime":
+    extInfo: '{"pkgDefQty": 1, "distrBillId": "PSh0347202407120066", "inStockTime":
-      "2024-07-12 08:15:52", "useFrequency": 1, "distrDetailId": "03839612", "multiChargeFlag":
+      "2024-07-12 11:27:06", "useFrequency": 1, "distrDetailId": "03839675", "multiChargeFlag":
      0}'
    bottleId:
    pkgType: '25'
@@ -40,7 +40,7 @@
    shelfKindName: 普通货位
    provName: 国药集团公司BCJj3
    provId: p1e34a
-    inStockDate: '2024-07-12 08:15:52'
+    inStockDate: '2024-07-12 11:27:07'
    mfrCode:
    made: 德国
    price:

--- a/data/b5_spd3_core_business_flow/message21
+++ b/data/b5_spd3_core_business_flow/message21
 二级库请领产品信息:
  list_a:
  - &id001
-    - hosGoodsId: h034700004548
+    - hosGoodsId: h034700004512
      purMode: 60
      grantRule:
      id:
-      goodsName: 新型冠状病毒检测试剂#JL$M
+      goodsName: 新型冠状病毒检测试剂t(I8N
      goodsSpec: G-31891
-      mdmGoodsCode: '11661507'
+      mdmGoodsCode: '11661465'
-      goodsCode: '00004548'
+      goodsCode: '00004512'
      unit: 支
      goodsMfrsName: 德国歌德公司 Geuder AG
      miDjmc: ''
@@ -16,22 +16,22 @@
      pkgDefName: '100'
      pkgDefQty: 100.0
      pkgQty:
-      qty: 1600.0
+      qty: 3700.0
      goodsImg: []
-      pkgDefId: ad7ebe1c0b0d42869c1bff9468f0d727
+      pkgDefId: c567d32761504700951570afcde929b1
      buyPkgQty:
      unitName: 100支/100
      price: 99.9999
      hosId:
      branchId:
-      deptId: e6a7862c7b3d49a69ab93979a8f32710
+      deptId: b12c7c6ca56e4b46b418b319cbadbea5
      deptName:
      areaCode:
      areaName:
-      targetDeptId: b82f526b0c4c438c95ccafd8a07d3af6
+      targetDeptId: 63c734f07fcc422ea80f49ca8e5bbd95
      targetDeptName: 设备科001
-      targetStockId: 49c401cc82704c7f8c9d110ff39e9106
+      targetStockId: 19d47ae6580b4dcf93b5b180771d2d85
-      targetStockName: 东土城路院区&BvGU中心库房
+      targetStockName: 东土城路院区7R4&E中心库房
      purchaseFlag: 1
      tempFlag: 0
      grantWay: 3
@@ -39,9 +39,9 @@
      codingType: 0
      purModeText: 检验试剂
      goodsGeneralName: 检测试剂
-      provName: 国药集团公司BCJj3
+      provName: 国药集团公司S57ui
-      noRecPkgQty: 2.0
+      noRecPkgQty: 41.0
-      noRecQty: 200.0
+      noRecQty: 4100.0
      autoUnpack: 0
      consumeQty:
      consumePkgQty:

--- a/data/b5_spd3_core_business_flow/message22
+++ b/data/b5_spd3_core_business_flow/message22
@@ -2,8 +2,8 @@
  list_a:
  - &id001
    - id: 529a05a8036748ca8c3c7c5e310ef149
-      lastModified: '2024-07-12 08:16:19'
+      lastModified: '2024-07-12 11:27:26'
-      version: 1
+      version: 2
      createTime: '2024-07-12 08:02:32'
      createUser: h0347_UID-051410
      lastModifiedUser: h0347_UID-051410

--- a/data/b5_spd3_core_business_flow/message7
+++ b/data/b5_spd3_core_business_flow/message7
 采购计划单号:
-  orderNo1: PLAN2024071232520
+  orderNo1: PLAN2024071232518
-  orderNo2: PLAN2024071232520
+  orderNo2: PLAN2024071232518
--- a/data/b5_spd3_core_business_flow/message8
+++ b/data/b5_spd3_core_business_flow/message8
 配送订单信息:
  list_a:
  - &id001
-    - id: Ch034720240712000091
+    - id: Nh034720240712000002
-      lastModified: '2024-07-12 11:17:11'
+      orderNo: SSTZ202407120319
-      version: 0
+      sourceOrderNo: SSSQ202407120341
-      createTime: '2024-07-12 11:17:11'
-      createUser: h0347_UID-051410
-      lastModifiedUser:
-      orderNo: CG2024071221204
-      billMode: '66'
-      recType: YND
      hosId: h0347
-      branchId: h0347-3745
-      deptId:
-      deptName:
-      recOrgId: b82f526b0c4c438c95ccafd8a07d3af6
-      recOrgName: 设备科001
-      areaCode:
-      areaName:
-      billExpdtDate:
-      sourceId: Ph034720240712029167
-      sourceType:
-      inSettlement:
-      recUser:
-      recPhone:
-      recAddr: 自动化测试
-      provId: p1e34a
-      provName: 国药集团公司BCJj3
-      subSendFlag:
-      exeProvId: p1e34a
-      exeProvName: 国药集团公司BCJj3
-      billRelationJson:
-      extInfo:
-      barcodeFlag: 1
-      pkgFlag:
-      remark: ''
-      priority:
-      closeStatus: 0
-      closeDate:
-      upStatus:
-      tbStatus: 30
-      hosVersion: 3
-      billType: CGD
      hosName: 邹城市人民医院(test)
      branchName: 东土城路院区&BvGU
-      sumQty: 10000.0
+      recDeptName: 二级检验科002
-      sumPkgQty: 100.0
+      operName: 血管扩张术
-      sumAmount: '999999.0000'
+      operDate: '2024-07-13'
-      planOrderNo: PLAN2024071232522
+      operDoctor: 李*
+      patientName: 张*
+      status: 10
+      statusText: 待确认
+      version: 0
+      patientInHosId: '123456'
+      surDeptName: ''
+      remark: 自动化测试
+      createUserName: 自动化测试S1C9r
+      distPriority: 0
+      distPriorityText:
+      distId:
+      distNo:
+      hosVersion: 3
+      createTime: '2024-07-12 11:25:41'
+      sumQty:
+      sumAmount:
+      operationPkg: 0
+      provId: p1e34a
+      provName: 国药集团公司BCJj3
+      subProvId: ''
+      subProvName: ''
+      recDeptId: e6a7862c7b3d49a69ab93979a8f32710
  list_b:
  - *id001
  list_c:

--- a/data/b5_spd3_core_business_flow/message9
+++ b/data/b5_spd3_core_business_flow/message9
 配送订单详细信息:
  list_a:
  - &id001
-    - id: 8a4737aac84b410bb203b4c050b31e58
+    id: Nh034720240712000002
-      lastModified:
+    orderNo: SSTZ202407120319
-      version:
+    sourceOrderNo: SSSQ202407120341
-      createTime:
+    hosId: h0347
-      createUser:
+    hosName: 邹城市人民医院(test)
-      lastModifiedUser:
+    branchName: 东土城路院区&BvGU
-      pid: Ch034720240712000091
+    recDeptName: 二级检验科002
-      orderNo: CG2024071221204
+    operName: 血管扩张术
-      sourceId: d4a297506e0b426faf4505f215dc9a68
+    operDate: '2024-07-13'
-      hosGoodsId: h034700004548
+    operDoctor: 李*
-      mdmGoodsCode: '11661507'
+    patientName: 张*
-      goodsCode: '00004548'
+    status: 20
-      purMode: 60
+    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
      price: '99.9999'
-      supplyId: 658f164522e44b3fb2e17fba17a95da1
+      inSettlement: 3
-      pkgDefId: ad7ebe1c0b0d42869c1bff9468f0d727
+      inSettlementText: 消耗结算
-      pkgDefName: '100'
+      goodsName: 高值牙钻机yg5eu
-      pkgDefQty: 100.0
+      goodsSpec: G-31891
-      pkgQty: 100.0
+      goodsCode: '00004546'
-      qty: 10000.0
+      goodsMfrsId: mfrs-11229
-      conPkgQty: 100.0
+      goodsMfrsName: 德国歌德公司 Geuder AG
-      conQty: 10000.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":"Ph034720240712029167","planDetailId":"d4a297506e0b426faf4505f215dc9a68"}'
-      extInfo: '{"goodsGg":"G-31891","goodsCode":"00004548","purMode":60,"goodsName":"新型冠状病毒检测试剂#JL$M"}'
-      remark:
-      tbStatus:
-      hosVersion:
      unit: 支
-      goodsName: 新型冠状病毒检测试剂#JL$M
+      subProvId: p1e34a
-      mfrsId: mfrs-11229
+      subProvName: 国药集团公司BCJj3
-      mfrsName: 德国歌德公司 Geuder AG
+      totalAmount: '99.9999'
-      goodsGg: G-31891
+      spdGoodsCode: '11661505'
-      mdmGoodsSpecCode: '11661507'
+      barCodeMng: 2
-      erpCode: '11661507'
+      erpCode: '11661505'
-      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:
-      diUse: '01123456789012'
      multiChargeFlag: 0
      useFrequency: 1
      chargeUnit:
-      amount: '999999.0000'
+      hitCode: '12'
-      unitName: 100支/100
+      hitPrice: '99.999900'
-      subProvId: p1e34a
+      diUse:
-      subProvName: 国药集团公司BCJj3
+      goodsDi: '01123456789012'
-      subPrice: 99.9999
-      replPkgQty: 100.0
-      replQty: 10000.0
-      ybDefId:
-      logicId:
-      provGoodsId:
-      sendFlag:
-      curQry:
  list_b:
  - *id001
  list_c: