Merge remote-tracking branch 'remotes/origin/master' into core_flow

air_case/b5_spd3_core_business_flow/a_b2流程九请领业务流_二级库向中心库.air/a_b2流程九请领业务流_二级库向中心库.py

@@ -48,7 +48,7 @@ def second_dept_Request(hosGoodsId, type):
     # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
     GoodsId = hosGoodsId.replace(get_hosid(), '')
     # areaCode = get_stockAreaId_new(deptid2, deptname2, 2)
-    areaCode =process_tuple(get_id("select shelf_code from mcms_stock_shelf where address='二级检验科002'and shelf_name='默认库区'order by create_time desc LIMIT 1;"))
+    areaCode =process_tuple(get_id("select shelf_code from mcms_stock_shelf where address='二级检验科002'and shelf_name='默认库区' and create_user='%s'  LIMIT 1;"%uxid))
 
     request_body = commonFuc().get_business_data(module, "payload39", GoodsId, get_hosid(), deptid2, areaCode)
     print('我要请领_手工请领_列表查询', 'request_body', request_body)

air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air/a_b3流程十请领业务流_二级库向边仓.py

@@ -101,7 +101,7 @@ def second_dept_Request(hosGoodsId, type):
     # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
     GoodsId = hosGoodsId.replace(get_hosid(), '')
     # areaCode = get_stockAreaId_new(deptid2, deptname2, 2)
-    areaCode =process_tuple(get_id("select shelf_code from mcms_stock_shelf where address='二级检验科002'and shelf_name='默认库区'order by create_time desc LIMIT 1;"))
+    areaCode =process_tuple(get_id("select shelf_code from mcms_stock_shelf where address='二级检验科002'and shelf_name='默认库区' and create_user='%s'  LIMIT 1;"%uxid))
 
     request_body = commonFuc().get_business_data(module, "payload39", GoodsId, get_hosid(), deptid2, areaCode)
     print('我要请领_手工请领_列表查询', 'request_body', request_body)

air_case/b5_spd3_core_business_flow/a_b4流程十一请领业务流_二级库向直送.air/a_b4流程十一请领业务流_二级库向直送.py

@@ -103,7 +103,7 @@ def second_dept_Request(hosGoodsId, type):
     GoodsId = hosGoodsId.replace(get_hosid(), '')
     # areaCode = get_stockAreaId_new(deptid2, deptname2, 2)
     areaCode = process_tuple(get_id(
-        "select shelf_code from mcms_stock_shelf where address='二级检验科002'and shelf_name='默认库区'order by create_time desc LIMIT 1;"))
+        "select shelf_code from mcms_stock_shelf where address='二级检验科002'and shelf_name='默认库区' and create_user='%s'  LIMIT 1;" % uxid))
     request_body = commonFuc().get_business_data(module, "payload39", GoodsId, get_hosid(), deptid2, areaCode)
     print('我要请领_手工请领_列表查询', 'request_body', request_body)
     result = commonFuc().http_post(url, request_body, headers)

air_case/b5_spd3_core_business_flow/a_b6流程十三请领业务流_三级库向二级库.air/a_b6流程十三请领业务流_三级库向二级库.py

@@ -72,7 +72,7 @@ def second_dept_Request(hosGoodsId, type):
     # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
     GoodsId = hosGoodsId.replace(get_hosid(), '')
     # areaCode = get_stockAreaId_new(deptid3, deptname3, 3)
-    areaCode =process_tuple(get_id("select shelf_code from mcms_stock_shelf where address='三级检测组003'and shelf_name='默认库区'order by create_time desc LIMIT 1;"))
+    areaCode =process_tuple(get_id("select shelf_code from mcms_stock_shelf where address='三级检测组003'and shelf_name='默认库区' and create_user='%s'  LIMIT 1;" % uxid))
 
     request_body = commonFuc().get_business_data(module, "payload39", GoodsId, get_hosid(), deptid3, areaCode)
     print('我要请领_手工请领_列表查询', 'request_body', request_body)
@@ -167,7 +167,7 @@ def BuyCarSubmit():
     deptname3 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3']
     # areaCode = get_stockAreaId_new(deptid3, deptname3, 3)
     areaCode = process_tuple(get_id(
-        "select shelf_code from mcms_stock_shelf where address='三级检测组003'and shelf_name='默认库区'order by create_time desc LIMIT 1;"))
+        "select shelf_code from mcms_stock_shelf where address='三级检测组003'and shelf_name='默认库区' and create_user='%s'  LIMIT 1;" % uxid))
 
     request_body = commonFuc().get_business_data(module, "payload43", areaCode, get_hosid(), deptid3)
 

air_case/public1/public1/public1.py

@@ -630,8 +630,8 @@ def set_dept_user(dept_id, deptName, type=1):
 
     # stockAreaId = get_stockAreaId(dept_id, stockId)
     stockAreaId = process_tuple(get_id(
-        "select id from mcms_stock_shelf  where address='%s' and del_flag=0 order by CREATE_TIME desc LIMIT 1;" % (
-            deptName)))
+        "select id from mcms_stock_shelf  where address='%s' and stock_id='%s' and del_flag=0 order by CREATE_TIME desc LIMIT 1;" % (
+            deptName,stockId)))
     print(stockAreaId)
     # ====获取库区id===== 结束==========
     # dept_query_all()