Commit a97d947d authored by xiao-hesheng's avatar xiao-hesheng
Browse files

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

parent 21248413
...@@ -205,7 +205,8 @@ def check_mcms_dept_buy(type=16): ...@@ -205,7 +205,8 @@ def check_mcms_dept_buy(type=16):
# area_code = get_stockAreaId_new(deptid2, deptname2, 2) # area_code = get_stockAreaId_new(deptid2, deptname2, 2)
info = FileUtils().r_info8("b5_spd3_core_business_flow", "库区信息", 'message22') info = FileUtils().r_info8("b5_spd3_core_business_flow", "库区信息", 'message22')
list_a = info['list_a'] list_a = info['list_a']
area_code = commonFuc().analysis_json('shelfCode', list_a) # area_code = commonFuc().analysis_json('shelfCode', list_a)
area_code = get_stockAreaId_new_fromDb(deptname2, 2)
area_name = '默认库区' area_name = '默认库区'
# 读取文件中的信息 # 读取文件中的信息
info = FileUtils().r_info8('b5_spd3_core_business_flow', "二级库请领产品信息", 'message21') info = FileUtils().r_info8('b5_spd3_core_business_flow', "二级库请领产品信息", 'message21')
...@@ -217,7 +218,7 @@ def check_mcms_dept_buy(type=16): ...@@ -217,7 +218,7 @@ def check_mcms_dept_buy(type=16):
pkgDefId = commonFuc().analysis_json('pkgDefId', list_a) pkgDefId = commonFuc().analysis_json('pkgDefId', list_a)
pkgDefName = commonFuc().analysis_json('pkgDefName', list_a) pkgDefName = commonFuc().analysis_json('pkgDefName', list_a)
# 获取边仓id # 获取边仓id
time.sleep(3) time.sleep(6)
target_stock_id = get_id("select logic_id FROM yb_direct WHERE branch_id ='%s' order by create_time desc LIMIT 1;" % branch_id) target_stock_id = get_id("select logic_id FROM yb_direct WHERE branch_id ='%s' order by create_time desc LIMIT 1;" % branch_id)
bill_expdt_date = get_expdt_date( bill_expdt_date = get_expdt_date(
"select bill_expdt_date from mcms_dept_buy where branch_id='%s' and bill_mode='%s' and buy_kind='KS' order by create_time desc LIMIT 1;" % ( "select bill_expdt_date from mcms_dept_buy where branch_id='%s' and bill_mode='%s' and buy_kind='KS' order by create_time desc LIMIT 1;" % (
...@@ -305,7 +306,7 @@ def check_mcms_dept_buy_approval_after(type=16): ...@@ -305,7 +306,7 @@ def check_mcms_dept_buy_approval_after(type=16):
# area_code = get_stockAreaId_new(deptid2, deptname2, 2) # area_code = get_stockAreaId_new(deptid2, deptname2, 2)
info = FileUtils().r_info8("b5_spd3_core_business_flow", "库区信息", 'message22') info = FileUtils().r_info8("b5_spd3_core_business_flow", "库区信息", 'message22')
list_a = info['list_a'] list_a = info['list_a']
area_code = commonFuc().analysis_json('shelfCode', list_a) area_code = get_stockAreaId_new_fromDb(deptname2, 2)
area_name = '默认库区' area_name = '默认库区'
# 读取文件中的信息 # 读取文件中的信息
info = FileUtils().r_info8('b5_spd3_core_business_flow', "二级库请领产品信息", 'message21') info = FileUtils().r_info8('b5_spd3_core_business_flow', "二级库请领产品信息", 'message21')
...@@ -495,6 +496,7 @@ def main(): ...@@ -495,6 +496,7 @@ def main():
# # # 试剂 # # # 试剂
second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3) second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId'], 3)
check_mcms_dept_buy_car(3) check_mcms_dept_buy_car(3)
time.sleep(8)
BuyCarSubmit() # 请领车提交 BuyCarSubmit() # 请领车提交
time.sleep(8) time.sleep(8)
# 调用函数对数据库中的数据进行验证和比对 # 调用函数对数据库中的数据进行验证和比对
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment