数据库验证流程十二脚本编写

air_case/b6_spd3_core_business_flow_database_check/a_b4流程十一请领业务流_二级库向直送_数据库验证.air/a_b4流程十一请领业务流_二级库向直送_数据库验证.py

@@ -11,7 +11,8 @@ from common.db.sql.sql_tools import get_create_time, check_mcms_dept_buy_car_sql
     get_goods_mfrs_id, get_supply_id, check_mcms_pur_sql, check_source_id, get_pkg_def_id, get_buyBillId, \
     get_planBillId, get_planOrderNo, get_buyOrderNo, get_purOrderNo, get_purBillId, get_distrBillId, \
     get_distrOrderNo, get_distr_detail_id, get_ext_info, get_login_user_uxid_bydb, get_purBillDate, get_purBillDate2, \
-    get_mcms_chek_purBillDate
+    get_mcms_chek_purBillDate, get_PICK_id, get_PICK_order_no, get_account_date, get_checkBillId, get_checkOrderNo, \
+    get_psiInBillId, get_psiInOrderNo, check_batch_id, check_barcode_id
 from common.db.sql.sql_tools_out import check_out_check_mcms_purchase
 
 from common.fileUtls import FileUtils
@@ -1549,7 +1550,7 @@ def check_mcms_check_batch(type, check_no, order_no, hos_goods_id):
     mdm_goods_code = get_mdm_goods_code1(hos_goods_id)
     goods_code = get_goods_code1(hos_goods_id)
     sql = "select id from hdi_barcode  where code_type='%s' and branch_id='%s' order by create_time desc LIMIT 1;" % (
-    bill_mode, branch_id)
+        bill_mode, branch_id)
     barcode_id = get_id(sql)
     create_user = get_login_user_uxid()
     create_time = get_create_time("select create_time from mcms_check_batch where pid='%s'" % check_no)
@@ -1738,8 +1739,8 @@ def check_mcms_psi(type=1):
     source_repl_id = source_no
     source_corp_id = get_hosid()
     source_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid1']
-    source_dept_name =FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid1']
-    source_stock_id = get_stockId_fromdb(get_branch_name()+'中心库房')
+    source_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid1']
+    source_stock_id = get_stockId_fromdb(get_branch_name() + '中心库房')
     accounter = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
     account_date = get_create_time("select account_date from  mcms_psi where id='%s';" % id_out)
 
@@ -1771,7 +1772,7 @@ def check_mcms_psi(type=1):
     last_modified = get_create_time("select last_modified from  mcms_psi where id='%s';" % id_out)
     last_modified_user = create_user
     source_branch_id = get_branch_id()
-    source_area_code=get_stockAreaId_new_fromDb(source_dept_name)
+    source_area_code = get_stockAreaId_new_fromDb(source_dept_name)
     if type == 1:
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi_out1',
                                                  id_out,
@@ -1786,7 +1787,8 @@ def check_mcms_psi(type=1):
                                                  , create_time, last_modified, last_modified_user)
     elif type == 2:
 
-        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi_out2', id_out,
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi_out2',
+                                                 id_out,
                                                  order_no_out, target_corp_id, target_branch_id, target_dept_id,
                                                  target_dept_name, target_stock_id
                                                  , target_area_code, source_id_out, source_no_out, source_repl_id,
@@ -1798,7 +1800,8 @@ def check_mcms_psi(type=1):
                                                  , create_time, last_modified, last_modified_user)
     else:
 
-        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi_out3',id_out,
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi_out3',
+                                                 id_out,
                                                  order_no_out, target_corp_id, target_branch_id, target_dept_id,
                                                  target_dept_name, target_stock_id
                                                  , target_area_code, source_id_out, source_no_out, source_repl_id,
@@ -1826,89 +1829,124 @@ def check_mcms_psi(type=1):
     else:
         print('error')
         commonFuc().check_text_exist_result_text('error', 'succees')
-def check_mcms_psi_dept_in(bill_mode=16):
+
+
+def check_mcms_psi_dept_in(type=16):
+    bill_mode = type
     branch_id = get_branch_id()
     sql = " select * from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_QL' order by   CREATE_TIME desc LIMIT 1;" % (
-    branch_id, bill_mode)
+        branch_id, bill_mode)
     actual = check_mcms_dept_buy_sql(sql)
     print(actual)
-    #获取主键
-    id=get_id(" select id from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_QL' order by   CREATE_TIME desc LIMIT 1;" % (
-    branch_id, bill_mode))
-    #获取source_id
+    # 获取主键
+    id = get_id(
+        " select id from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_QL' order by   CREATE_TIME desc LIMIT 1;" % (
+            branch_id, bill_mode))
+    # 获取source_id
     sql = "select id from  mcms_psi  where target_branch_id='%s' and bill_mode='%s' and stock_kind='CK_QL' order by   CREATE_TIME desc LIMIT 1;" % (
         branch_id, bill_mode)
     source_id = get_id(sql)
-    source_no=get_id("select order_no from  mcms_psi where id='%s';"%source_id)
-    #获取order_no
-    sql = " select order_no from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_SL' order by   CREATE_TIME desc LIMIT 1;" % (
-        branch_id, type)
+    source_no = get_id("select order_no from  mcms_psi where id='%s';" % source_id)
+    # 获取order_no
+    sql = " select order_no from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_QL' order by   CREATE_TIME desc LIMIT 1;" % (
+        branch_id, bill_mode)
     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_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
+    target_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
     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)
+    PICK_id = get_PICK_id(branch_id, bill_mode)
 
     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)
+    source_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid1']
+    source_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid1']
+    source_stock_id = get_stockId_fromdb(get_branch_name() + '中心库房')
+    source_area_code = get_stockAreaId_new_fromDb(source_dept_name, 1)
+    buyBillId = get_buyBillId(branch_id, bill_mode)
+    pickOrderNo = get_PICK_order_no(branch_id, bill_mode)
+    buyOrderNo = get_buyOrderNo(branch_id, bill_mode)
+    pickBillId = get_PICK_id(branch_id, bill_mode)
     psiDeptOutBillId = source_id
     psiDeptOutOrderNo = source_no
+    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"]
+    elif type == 66:
+        hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message3')["hosGoodsId"]
+    else:
+        hos_goods_id = None
+    planBillId = get_planBillId(hos_goods_id)
+    purOrderNo = get_purOrderNo(branch_id, bill_mode)
+    purBillId = get_purBillId(branch_id, bill_mode)
     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)
+    create_time = get_create_time("select create_time from  mcms_psi_dept where id='%s';" % id)
+    last_modified = get_create_time("select last_modified from  mcms_psi_dept where id='%s';" % id)
     last_modified_user = create_user
-    accounter=create_user
-    sql="select account_date from  mcms_psi_dept where id='%s';"%DR_ID
-    account_date=get_account_date(sql)
-    psiDeptInBillId=DR_ID
-    psiDeptInOrderNo=order_no
+    accounter = create_user
+    sql = "select account_date from  mcms_psi_dept where id='%s';" % id
+    account_date = get_account_date(sql)
+    psiDeptInBillId = id
+    psiDeptInOrderNo = order_no
+    source_repl_id = get_distrBillId(branch_id, bill_mode)
+    bill_relation_json = get_id(
+        "select bill_relation_json from mcms_psi_dept a where id = '%s';" % (
+            id))
+    print(bill_relation_json)
+    purBillDate = reGetString(bill_relation_json, r'purBillDate":"', r'""distrBillId')
+    distrBillId = get_distrBillId(branch_id, bill_mode)
+    distrOrderNo = get_distrOrderNo(branch_id, bill_mode)
+    checkBillId = get_checkBillId(branch_id, bill_mode)
+    checkOrderNo = get_checkOrderNo(branch_id, bill_mode)
+    psiInBillId = get_psiInBillId(branch_id, bill_mode)
+    psiInOrderNo = get_psiInOrderNo(branch_id, bill_mode)
+    planOrderNo=get_planOrderNo(hos_goods_id)
     if type == 16:
         # 子表检查
-        check_mcms_psi_dept_batch_in(DR_ID,type,order_no,source_id)
+        check_mcms_psi_dept_batch_in(id,type,order_no,source_id)
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                                 'mcms_psi_dept_in_1', DR_ID, order_no, target_corp_id, target_branch_id,
+                                                 'mcms_psi_dept_in_4', id, order_no, target_corp_id, target_branch_id,
                                                  target_dept_id, target_dept_name, target_stock_id
-                                                 , target_area_code, source_id,source_no, source_corp_id, source_branch_id,
+                                                 , target_area_code, source_id, source_no, source_repl_id,
+                                                 source_corp_id, source_branch_id,
                                                  source_dept_id, source_dept_name, source_stock_id, source_area_code,
-                                                 accounter,account_date,buyBillId, pickOrderNo, buyOrderNo, pickBillId, psiDeptOutBillId,
-                                                 psiDeptOutOrderNo,psiDeptInBillId,psiDeptInOrderNo
-                                                 , create_user, create_time, last_modified, last_modified_user
+                                                 accounter, account_date, buyBillId, planBillId, planOrderNo,
+                                                 buyOrderNo, purOrderNo, purBillId, purBillDate, distrBillId,
+                                                 distrOrderNo, checkBillId, checkOrderNo, psiInBillId, psiInOrderNo,
+                                                 psiDeptOutBillId, psiDeptOutOrderNo, psiDeptInBillId, psiDeptInOrderNo,
+                                                 create_user, create_time, last_modified, last_modified_user)
+
 
-                                                 )
     elif type == 20:
         # 子表检查
-        check_mcms_psi_dept_batch_in(DR_ID, type, order_no,source_id)
+        check_mcms_psi_dept_batch_in(id, type, order_no,source_id)
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                                 'mcms_psi_dept_in_2', DR_ID, order_no, target_corp_id, target_branch_id,
+                                                 'mcms_psi_dept_in_5', id, order_no, target_corp_id, target_branch_id,
                                                  target_dept_id, target_dept_name, target_stock_id
-                                                 , target_area_code, source_id,source_no, source_corp_id, source_branch_id,
+                                                 , target_area_code, source_id, source_no, source_corp_id,
+                                                 source_branch_id,
                                                  source_dept_id, source_dept_name, source_stock_id, source_area_code,
-                                                 accounter,account_date,buyBillId, pickOrderNo, buyOrderNo, pickBillId, psiDeptOutBillId,
-                                                 psiDeptOutOrderNo,psiDeptInBillId,psiDeptInOrderNo
+                                                 accounter, account_date, buyBillId, pickOrderNo, buyOrderNo,
+                                                 pickBillId, psiDeptOutBillId,
+                                                 psiDeptOutOrderNo, psiDeptInBillId, psiDeptInOrderNo
                                                  , create_user, create_time, last_modified, last_modified_user
 
                                                  )
     else:
         # 子表检查
-        check_mcms_psi_dept_batch_in(DR_ID, type, order_no,source_id)
+        check_mcms_psi_dept_batch_in(id, type, order_no,source_id)
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                                 'mcms_psi_dept_in_3', DR_ID, order_no, target_corp_id, target_branch_id,
+                                                 'mcms_psi_dept_in_6', id, order_no, target_corp_id, target_branch_id,
                                                  target_dept_id, target_dept_name, target_stock_id
-                                                 , target_area_code, source_id,source_no, source_corp_id, source_branch_id,
+                                                 , target_area_code, source_id, source_no, source_corp_id,
+                                                 source_branch_id,
                                                  source_dept_id, source_dept_name, source_stock_id, source_area_code,
-                                                 accounter,account_date,buyBillId, pickOrderNo, buyOrderNo, pickBillId, psiDeptOutBillId,
-                                                 psiDeptOutOrderNo,psiDeptInBillId,psiDeptInOrderNo
+                                                 accounter, account_date, buyBillId, pickOrderNo, buyOrderNo,
+                                                 pickBillId, psiDeptOutBillId,
+                                                 psiDeptOutOrderNo, psiDeptInBillId, psiDeptInOrderNo
                                                  , create_user, create_time, last_modified, last_modified_user
 
                                                  )
@@ -1932,6 +1970,90 @@ def check_mcms_psi_dept_in(bill_mode=16):
         print('error')
         commonFuc().check_text_exist_result_text('error', 'succees')
 
+def check_mcms_psi_dept_batch_in(DR_ID,type,order_no,source_id1):
+    branch_id = get_branch_id()
+    sql = " select * from  mcms_psi_dept_batch where pid='%s';" % (
+        DR_ID)
+    actual = check_mcms_dept_buy_sql(sql)
+    print('actual', actual)
+    batch_main_key = get_id("select id from mcms_psi_dept_batch where pid='%s';" % DR_ID)
+    pid = DR_ID
+    # order_no = get_id("select order_no from mcms_psi_dept_batch where pid='%s';" % DR_ID)
+    source_detail_id = source_id1+'0001'
+    pick_detail_id=None
+    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"]
+    mdm_goods_code = get_mdm_goods_code1(hos_goods_id)
+    goods_code = get_goods_code1(hos_goods_id)
+    pkg_def_id = get_pkg_def_id(hos_goods_id)
+    picker_name = FileUtils().r_info8("b2_herp3_bs", "用户名信息", 'message3')['username1']
+    picker = get_login_user_uxid_bydb(picker_name)
+    source_batch_id=get_id("select source_batch_id from mcms_psi_dept_batch where pid='%s';" % DR_ID)
+    target_batch_id=source_batch_id
+    if check_batch_id(source_batch_id)==True:
+        print('ok')
+        commonFuc().check_text_exist_result_text('succees', 'succees')
+    else:
+        commonFuc().check_text_exist_result_text('error', 'succees')
+    barcode_id=get_id("select barcode_id from mcms_psi_dept_batch where pid='%s';" % DR_ID)
+    if check_barcode_id(barcode_id)==True:
+        print('ok')
+        commonFuc().check_text_exist_result_text('succees', 'succees')
+    else:
+        commonFuc().check_text_exist_result_text('error', 'succees')
+    dept_name=FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+    shelf_code= get_stockAreaId_new_fromDb(dept_name, 2)
+    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_batch where pid='%s';" % DR_ID)
+    last_modified = get_create_time("select last_modified from  mcms_psi_dept_batch where pid='%s';" % DR_ID)
+    last_modified_user = create_user
+    if type == 16:
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_psi_dept_batch_in4', batch_main_key, pid, order_no,source_detail_id
+                                            ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id,
+                                            target_batch_id,barcode_id,shelf_code,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_dept_batch_in5', batch_main_key, pid, order_no,source_detail_id
+                                            ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id,
+                                            target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified,
+                                            last_modified_user
+
+                                                 )
+    else:
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_psi_dept_batch_in6',batch_main_key, pid, order_no,source_detail_id
+                                            ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id,
+                                            target_batch_id,barcode_id,shelf_code,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)
@@ -2006,7 +2128,7 @@ try:
         #     check_hdi_distr(int(i))
         #
         # time.sleep(20)
-        #到这里就是验收和中心库自动入库以及中心库出库
+        # #到这里就是验收和中心库自动入库以及中心库出库
         # check_accept_order(1)  # 低值 验收和自动入库和出库
         # time.sleep(6)
         # check_mcms_check(1)  # 调用函数检查验收单数据库写值
@@ -2021,10 +2143,11 @@ try:
         # check_mcms_check(3)  # 调用函数检查验收单数据库写值
         # check_mcms_psi(3)  # 调用函数检查中心库入库单数据库写值
         # time.sleep(6)
-        # # 上面暂时注释========================================
+        #
         # second_dept_one_key_in()
         # second_dept_one_key_in()
         # second_dept_one_key_in()
+        # # 上面暂时注释========================================
         # 检查二级库入库单
         check_mcms_psi_dept_in(16)
         check_mcms_psi_dept_in(20)

common/db/sql/sql_tools.py

@@ -411,6 +411,26 @@ def get_distrOrderNo(branch_id,bill_mode):
         "select order_no from hdi_distr a where id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
             get_distrBillId(branch_id,bill_mode), bill_mode))
     return distr_order_no
+def get_checkBillId(branch_id,bill_mode):
+    checkBillId=get_id(
+        "select id from  mcms_check where branch_id='%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
+             branch_id,bill_mode))
+    return checkBillId
+def get_checkOrderNo(branch_id,bill_mode):
+    checkOrderNo=get_id(
+        "select order_no from mcms_check a where id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
+            get_checkBillId(branch_id,bill_mode), bill_mode))
+    return checkOrderNo
+def get_psiInBillId(branch_id,bill_mode):
+    psiInBillId=get_id(
+        "select id from  mcms_psi where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_YS' order by create_time desc LIMIT 1;" % (
+             branch_id,bill_mode))
+    return psiInBillId
+def get_psiInOrderNo(branch_id,bill_mode):
+    psiInOrderNo=get_id(
+        "select order_no from mcms_psi a where id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
+            get_psiInBillId(branch_id,bill_mode), bill_mode))
+    return psiInOrderNo
 def check_in_check_mcms_purchase(sql):
     db, cursor = get_sql_conn()
     cursor.execute(sql)

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024072600068
-  CHECK_NO2: CHECKh03472024072600068
+  CHECK_NO1: CHECKh03472024072600072
+  CHECK_NO2: CHECKh03472024072600072

data/b6_spd3_core_business_flow_database_check/data

@@ -104,7 +104,7 @@
 "mcms_psi_dept_in_2": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "rec_type": "YND", "psi_flag": 1, "psi_kind": "107", "stock_kind": "RK_SL", "target_corp_id": "%s", "target_branch_id": "%s", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "默认库区", "source_id": "%s", "source_no": "%s", "source_repl_id": None, "source_corp_id": "%s", "source_branch_id": "%s", "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": "%s", "source_area_name": "默认库区", "consume_type": 0, "patient_id": None, "patient_name": None, "machine_id": None, "machine_name": None, "his_charge_no": None, "remark": None, "tb_status": 30, "accounter": "%s", "account_date": "%s", "bill_relation_json": "{"buyBillId":"%s","pickOrderNo":"%s","buyOrderNo":"%s","pickBillId":"%s","psiDeptOutBillId":"%s","psiDeptOutOrderNo":"%s","psiDeptInBillId":"%s","psiDeptInOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "last_auditor": None, "last_audit_time": None, "reject_reason": None, "reject_user": None, "reject_time": None, "initial_order": None, "source_type": "SG", "target_coding_type": None}'
 "mcms_psi_dept_in_3": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "YND", "psi_flag": 1, "psi_kind": "107", "stock_kind": "RK_SL", "target_corp_id": "%s", "target_branch_id": "%s", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "默认库区", "source_id": "%s", "source_no": "%s", "source_repl_id": None, "source_corp_id": "%s", "source_branch_id": "%s", "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": "%s", "source_area_name": "默认库区", "consume_type": 0, "patient_id": None, "patient_name": None, "machine_id": None, "machine_name": None, "his_charge_no": None, "remark": None, "tb_status": 30, "accounter": "%s", "account_date": "%s", "bill_relation_json": "{"buyBillId":"%s","pickOrderNo":"%s","buyOrderNo":"%s","pickBillId":"%s","psiDeptOutBillId":"%s","psiDeptOutOrderNo":"%s","psiDeptInBillId":"%s","psiDeptInOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "last_auditor": None, "last_audit_time": None, "reject_reason": None, "reject_user": None, "reject_time": None, "initial_order": None, "source_type": "SG", "target_coding_type": None}'
 
-#入库单子表
+#科室入库单子表
 "mcms_psi_dept_batch_in1": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": %s, "pur_mode": 10, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("100.00"), "unit_name": "100支/100", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}'
 "mcms_psi_dept_batch_in2": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": %s, "pur_mode": 20, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("1.00"), "unit_name": "1支", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}'
 "mcms_psi_dept_batch_in3": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": %s, "pur_mode": 60, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("100.00"), "unit_name": "100支/100", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}'
@@ -122,4 +122,8 @@
 #直送二级库入库单
 "mcms_psi_dept_in_4": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "rec_type": "YND", "psi_flag": 1, "psi_kind": "102", "stock_kind": "RK_QL", "target_corp_id": "%s", "target_branch_id": "%s", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "默认库区", "source_id": "%s", "source_no": "%s", "source_repl_id": "%s", "source_corp_id": "%s", "source_branch_id": "%s", "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": "%s", "source_area_name": "默认库区", "consume_type": 0, "patient_id": None, "patient_name": None, "machine_id": None, "machine_name": None, "his_charge_no": None, "remark": None, "tb_status": 30, "accounter": "%s", "account_date": "%s", "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s","checkBillId":"%s","checkOrderNo":"%s","psiInBillId":"%s","psiInOrderNo":"%s","psiOutBillId":"%s","psiOutOrderNo":"%s","psiDeptInBillId":"%s","psiDeptInOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "last_auditor": None, "last_audit_time": None, "reject_reason": None, "reject_user": None, "reject_time": None, "initial_order": None, "source_type": "SG", "target_coding_type": None}'
 "mcms_psi_dept_in_5": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "rec_type": "YND", "psi_flag": 1, "psi_kind": "102", "stock_kind": "RK_QL", "target_corp_id": "%s", "target_branch_id": "%s", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "默认库区", "source_id": "%s", "source_no": "%s", "source_repl_id": "%s", "source_corp_id": "%s", "source_branch_id": "%s", "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": "%s", "source_area_name": "默认库区", "consume_type": 0, "patient_id": None, "patient_name": None, "machine_id": None, "machine_name": None, "his_charge_no": None, "remark": None, "tb_status": 30, "accounter": "%s", "account_date": "%s", "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s","checkBillId":"%s","checkOrderNo":"%s","psiInBillId":"%s","psiInOrderNo":"%s","psiOutBillId":"%s","psiOutOrderNo":"%s","psiDeptInBillId":"%s","psiDeptInOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "last_auditor": None, "last_audit_time": None, "reject_reason": None, "reject_user": None, "reject_time": None, "initial_order": None, "source_type": "SG", "target_coding_type": None}'
-"mcms_psi_dept_in_6": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "YND", "psi_flag": 1, "psi_kind": "102", "stock_kind": "RK_QL", "target_corp_id": "%s", "target_branch_id": "%s", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "默认库区", "source_id": "%s", "source_no": "%s", "source_repl_id": "%s", "source_corp_id": "%s", "source_branch_id": "%s", "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": "%s", "source_area_name": "默认库区", "consume_type": 0, "patient_id": None, "patient_name": None, "machine_id": None, "machine_name": None, "his_charge_no": None, "remark": None, "tb_status": 30, "accounter": "%s", "account_date": "%s", "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s","checkBillId":"%s","checkOrderNo":"%s","psiInBillId":"%s","psiInOrderNo":"%s","psiOutBillId":"%s","psiOutOrderNo":"%s","psiDeptInBillId":"%s","psiDeptInOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "last_auditor": None, "last_audit_time": None, "reject_reason": None, "reject_user": None, "reject_time": None, "initial_order": None, "source_type": "SG", "target_coding_type": None}'
+"mcms_psi_dept_in_6": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "YND", "psi_flag": 1, "psi_kind": "102", "stock_kind": "RK_QL", "target_corp_id": "%s", "target_branch_id": "%s", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "默认库区", "source_id": "%s", "source_no": "%s", "source_repl_id": "%s", "source_corp_id": "%s", "source_branch_id": "%s", "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": "%s", "source_area_name": "默认库区", "consume_type": 0, "patient_id": None, "patient_name": None, "machine_id": None, "machine_name": None, "his_charge_no": None, "remark": None, "tb_status": 30, "accounter": "%s", "account_date": "%s", "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s","checkBillId":"%s","checkOrderNo":"%s","psiInBillId":"%s","psiInOrderNo":"%s","psiOutBillId":"%s","psiOutOrderNo":"%s","psiDeptInBillId":"%s","psiDeptInOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "last_auditor": None, "last_audit_time": None, "reject_reason": None, "reject_user": None, "reject_time": None, "initial_order": None, "source_type": "SG", "target_coding_type": None}'
\ No newline at end of file
+#科室入库单子表
+"mcms_psi_dept_batch_in4": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": %s, "pur_mode": 10, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("100.00"), "unit_name": "100支/100", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": null, "version": 0}'
+"mcms_psi_dept_batch_in5": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": %s, "pur_mode": 20, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("1.00"), "unit_name": "1支", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": null, "version": 0}'
+"mcms_psi_dept_batch_in6": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": %s, "pur_mode": 60, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("100.00"), "unit_name": "100支/100", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": null, "version": 0}'