流程十五脚本提交

air_case/b6_spd3_core_business_flow_database_check/a_b8流程十五退库业务_三级库向二级库退库_数据库验证.air/a_b8流程十五退库业务_三级库向二级库退库_数据库验证.py

@@ -331,7 +331,6 @@ def check_mcms_psi_dept_in(type1=16):
     if type1 == 16:
         # 子表检查
         check_mcms_psi_dept_batch_in(DR_ID,type1,order_no)
-
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
                                                  'mcms_psi_dept_tkrk1', DR_ID, order_no, target_corp_id, target_branch_id,
                                                  target_dept_id, target_dept_name, target_stock_id
@@ -344,7 +343,6 @@ def check_mcms_psi_dept_in(type1=16):
     elif type1 == 20:
         # 子表检查
         check_mcms_psi_dept_batch_in(DR_ID,type1,order_no)
-
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
                                                    'mcms_psi_dept_tkrk2', DR_ID, order_no, target_corp_id, target_branch_id,
                                                  target_dept_id, target_dept_name, target_stock_id

air_case/b6_spd3_core_business_flow_database_check/a_b9流程十六退库业务_二级库向一级库退库_数据库验证.air/a_b9流程十六退库业务_二级库向一级库退库_数据库验证.py

@@ -26,20 +26,20 @@ python runner_test.py tag id2303-19 debug mdm3
 def check_mcms_psi_dept_out(type1=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_LYTK' order by   CREATE_TIME desc LIMIT 1;" % (
+    sql = " select * from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='CK_TK' order by   CREATE_TIME desc LIMIT 1;" % (
     branch_id, type1)
     actual = check_mcms_dept_buy_sql(sql)
     print(actual)
-    DR_ID=get_id(" select id from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='CK_LYTK' order by   CREATE_TIME desc LIMIT 1;" % (
+    DR_ID=get_id(" select id from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='CK_TK' order by   CREATE_TIME desc LIMIT 1;" % (
     branch_id, type1))
     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')['deptid2']
-    target_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+    target_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid1']
+    target_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid1']
     target_stock_id = get_stockId_fromdb(target_dept_name + '库房')
-    target_area_code = get_stockAreaId_new_fromDb(target_dept_name, 2)
+    target_area_code = get_stockAreaId_new_fromDb(target_dept_name, 1)
     PICK_id = get_PICK_id(branch_id, type1)
     source_id = PICK_id
     source_corp_id = get_hosid()