流程十四脚本编写

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

@@ -265,6 +265,7 @@ def edit_goods_target(currentDeptId, targetDeptId):
         print('编辑产品请领渠道result', result)
 
 
+
 def pick_execute():
     module = "b5_spd3_core_business_flow"
     # # 登录获取用户id等信息，使用创建的用户登录===========开始
@@ -283,7 +284,7 @@ def pick_execute():
                                                                               "herpService_stock_out_buyPage_url")
     info=  FileUtils().r_info8('b5_spd3_core_business_flow', "三级库向二级库请领单号", 'message27')
 
-    DRNo_list = []
+    # DRNo_list = []
     for i in range(1, 4):
         if i == 1:
             orderNo = info['buy_NO1']
@@ -333,7 +334,7 @@ def pick_execute():
             print('udi_code', udi_code)
             if udi_code=='pkgCodeSee':
                 print('没有获取到条码')
-                return
+                sys.exit(0)
             if billMode == '16':
                 targetAreaCode, sourceId = pickScan2(BH_ID, udi_code, 1,token)  # 低值
             elif billMode == '20':
@@ -349,20 +350,33 @@ def pick_execute():
             print('提交拣货执行单=================', url)
             if billMode == '16':
                 request_body = commonFuc().get_business_data(module, "payload51_1_1", targetAreaCode, sourceId)
+                print('提交拣货执行单', 'request_body', request_body)
+                result = commonFuc().http_post(url, request_body, headers)
+                print('提交拣货执行单,result1', result)
+                DR_id = commonFuc().analysis_json('data', result)
+                # 将拣货单id写入文件
+                info1 = (DR_id, DR_id)
+                titlename = ('DR_NO1低值', 'DR_NO1低值')
+                FileUtils().w_info8(info1, 'b5_spd3_core_business_flow', '拣货单低值id', titlename, 'message28')
             elif billMode == '20':
                 request_body = commonFuc().get_business_data(module, "payload51_1_2", targetAreaCode, sourceId)
+                print('提交拣货执行单', 'request_body', request_body)
+                result = commonFuc().http_post(url, request_body, headers)
+                print('提交拣货执行单,result1', result)
+                DR_id = commonFuc().analysis_json('data', result)
+                info1 = (DR_id, DR_id)
+                titlename = ('DR_NO1高值', 'DR_NO1高值')
+                FileUtils().w_info8(info1, 'b5_spd3_core_business_flow', '拣货单高值id', titlename, 'message28')
             elif billMode == '66':
                 request_body = commonFuc().get_business_data(module, "payload51_1_3", targetAreaCode, sourceId)
+                print('提交拣货执行单', 'request_body', request_body)
+                result = commonFuc().http_post(url, request_body, headers)
+                print('提交拣货执行单,result1', result)
+                DR_id = commonFuc().analysis_json('data', result)
+                info1 = (DR_id, DR_id)
+                titlename = ('DR_NO1试剂', 'DR_NO1试剂')
+                FileUtils().w_info8(info1, 'b5_spd3_core_business_flow', '拣货单试剂id', titlename, 'message28')
 
-            print('提交拣货执行单', 'request_body', request_body)
-            result = commonFuc().http_post(url, request_body, headers)
-            print('提交拣货执行单,result1', result)
-            DR_id = commonFuc().analysis_json('data', result)
-            DRNo_list.append(DR_id)
-            # 将拣货单id写入文件
-    info = (DRNo_list[0], DRNo_list[1], DRNo_list[2])
-    titlename = ('DR_NO1', 'DR_NO2', 'DR_NO3')
-    FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '拣货单id', titlename, 'message28')
 
 def main():
     try:

air_case/b6_spd3_core_business_flow_database_check/a_b6流程十三请领业务流_三级库向二级库_数据库验证.air/a_b6流程十三请领业务流_三级库向二级库_数据库验证.py

@@ -536,15 +536,18 @@ def check_mcms_psi_dept(type=16):
     branch_id, type)
     actual = check_mcms_dept_buy_sql(sql)
     print(actual)
-    info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单id", 'message28')
+    # info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单id", 'message28')
     # print(info)
 
     if type == 16:
-        DR_ID = info['DR_NO2']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单低值id", 'message28')
+        DR_ID = info['DR_NO1低值']
     elif type == 20:
-        DR_ID = info['DR_NO3']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单高值id", 'message28')
+        DR_ID = info['DR_NO1高值']
     else:
-        DR_ID = info['DR_NO1']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单试剂id", 'message28')
+        DR_ID = info['DR_NO1试剂']
     DR_ID = ''.join(DR_ID)
     sql = "select order_no from mcms_psi_dept where id='%s';" % DR_ID
     order_no = get_id(sql)
@@ -632,13 +635,16 @@ def check_mcms_psi_dept_in(type=16):
     branch_id, type)
     actual = check_mcms_dept_buy_sql(sql)
     print(actual)
-    info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单id", 'message28')
+
     if type == 16:
-        source_id = info['DR_NO2']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单低值id", 'message28')
+        source_id = info['DR_NO1低值']
     elif type == 20:
-        source_id = info['DR_NO3']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单高值id", 'message28')
+        source_id = info['DR_NO1高值']
     else:
-        source_id = info['DR_NO1']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单试剂id", 'message28')
+        source_id = info['DR_NO1试剂']
     source_id = ''.join(source_id)
     source_no=get_id("select order_no from  mcms_psi_dept where id='%s';"%source_id)
     #获取入库单主键DR_ID
@@ -867,11 +873,13 @@ def main():
     # 低值拣货执行
     pick_execute()
 
+    time.sleep(6)
     # 检查拣货单
     list_data = ['16', '20', '66']
     for i in list_data:
         check_mcms_pick(int(i))
 
+    time.sleep(6)
     # 检查出库单
     check_mcms_psi_dept(16)
     check_mcms_psi_dept(20)