开发在数据库中对部门请领的表增加了字段，create_from，所以需要调整脚本

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

@@ -2287,6 +2287,7 @@ def check_mcms_hos_batch(type=1):  # 检查批次表信息
     stock_id = get_stockId_fromdb(stock_name)
     src_batch_id = get_id("select src_batch_id from mcms_hos_batch where id='%s';" % id)
     src_batch_id = id
+    hos_goods_id='hos_goods_id'
     if type == 1:
         hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
     elif type == 2:
@@ -2350,7 +2351,8 @@ def check_mcms_hos_batch(type=1):  # 检查批次表信息
                                                  goodsName, erpCode, create_user, create_time
                                                  , last_modified, last_modified_user)
     else:
-        fcatId=get_id("select id from mcms_goods_kind where kind_name='财务试剂';")
+        # fcatId=get_id("select id from mcms_goods_kind where kind_name='财务试剂';")
+
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_hos_batch3',
                                                  id,
                                                  hos_id, branch_id, stock_id, src_batch_id, hos_goods_id,
@@ -2358,7 +2360,7 @@ def check_mcms_hos_batch(type=1):  # 检查批次表信息
                                                  , mfrs_id, supply_id, prov_id, prov_name, sub_prov_id,
                                                  sub_prov_name, expdt_date, product_date
                                                  , distr_id, distr_detail_id, purBillId, in_time, goodsGg, goodsCode,
-                                                 goodsName, erpCode, fcatId,create_user, create_time
+                                                 goodsName, erpCode,create_user, create_time
                                                  , last_modified, last_modified_user)
     # 对比预期值和实际值是否一致
     actual_value1 = get_process_list2(actual)

air_case/public1/public1/public1.py

@@ -2073,10 +2073,7 @@ def get_stockAreaId_new_fromDb(deptName, type=1):
     # 获取库房id==========结束============
 
     # ====获取库区id===== 开始==========
-    if type==1:
-        sql="select shelf_code from mcms_stock_shelf where stock_Id='%s' and shelf_no like '%%%s%%' and default_flag=1 and stock_type=1;"% (stockId,deptName)
-    else:
-        sql = "select shelf_code from mcms_stock_shelf where stock_Id='%s'and address='%s';" % (stockId, deptName)
+    sql = "select shelf_code from mcms_stock_shelf where stock_Id='%s'and address='%s';" % (stockId, deptName)
     print(sql)
     shelfCode = get_id(sql)
     return shelfCode