优化调整脚本

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

@@ -5,7 +5,7 @@ import traceback
 from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
 from air_case.public1.public1.public1 import *
 from common.db.sql.sql_del_branch_info import delData
-from common.db.sql.sql_tools import process_tuple, get_id
+from common.db.sql.sql_tools import process_tuple, get_id, get_last_auditor
 
 from common.fileUtls import FileUtils
 from common.run_cmd_script import execute_command
@@ -102,7 +102,8 @@ 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='默认库区'order by create_time desc LIMIT 1;"))
     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)
@@ -128,7 +129,7 @@ def second_dept_Request(hosGoodsId, type):
     goodsGeneralName = commonFuc().analysis_json('goodsGeneralName', data1)
     provName = commonFuc().analysis_json('provName', data1)
     pkgDefId = commonFuc().analysis_json('pkgDefId', data1)
-    pkgDefName= commonFuc().analysis_json('pkgDefName', data1)
+    pkgDefName = commonFuc().analysis_json('pkgDefName', data1)
     # 信息写入文件
     list_a = []
     list_b = []
@@ -194,7 +195,7 @@ def BuyCarSubmit():
     print('请领车查询=================', url)
     deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
     deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
-    areaCode = get_stockAreaId_new(deptid2, deptname2, 2)
+    areaCode = get_stockAreaId_new_fromDb(deptname2, 2)
     request_body = commonFuc().get_business_data(module, "payload43", areaCode, get_hosid(), deptid2)
 
     print('请领车查询', 'request_body', request_body)
@@ -771,7 +772,7 @@ def check_accept_order(type=1):
         print('result', result2)
         data = commonFuc().analysis_json('data', result2)
         code = commonFuc().analysis_json('code', result2)
-        msg= commonFuc().analysis_json('msg', result2)
+        msg = commonFuc().analysis_json('msg', result2)
         print(code)
         if code == 0 and len(data) >= 1:
             break
@@ -822,12 +823,11 @@ def check_accept_order(type=1):
                 time.sleep(6)
             continue
 
-
-
     info = (CHECK_NO, CHECK_NO)
     titlename = ('CHECK_NO1', 'CHECK_NO2')
     FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '验收单号', titlename, 'message15')
 
+
 def main():
     try:
         # add_dept2()  # 新增一个二级科室
@@ -842,21 +842,38 @@ def main():
         updateUserLoginDefaultRange(get_listUserMgrRangePage(2))  # 设置登录账号默认权限是二级库
         for i in range(6):
             # # 低值
-            second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
+            second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'],
+                                1)
             # # 高值
-            second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'], 2)
+            second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId'],
+                                2)
             # # 试剂
-            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)
             BuyCarSubmit()  # 请领车提交
             for i in range(6):  # 三个单据共审批6次
                 approval_center()
             # 采购模块处理
             purchase_module_process()
-             # 三个单据共审批3次
-            approval_center(FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号试剂', 'message12'))
-            approval_center(FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号', 'message7'))
-            approval_center(FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号高值', 'message11'))
-
+            # 三个单据共审批3次
+            while True:
+                try:
+                    approval_center(FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号试剂', 'message12'))
+                    approval_center(FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号', 'message7'))
+                    approval_center(FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号高值', 'message11'))
+                except:
+                    print('审批流程可能被修改,等待手工审批')
+                    if get_last_auditor(
+                            FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号试剂', 'message12')) \
+                            and get_last_auditor(
+                            FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号试剂', 'message7'))\
+                            and get_last_auditor(
+                            FileUtils().r_info8('b5_spd3_core_business_flow', '采购计划单号试剂', 'message11'))!= None:
+                        break
+                    else:
+                        continue
+                else:
+                    break
             order_dp(1)  # 1低值
             order_dp(2)  # 2高值
             order_dp(3)  # 3试剂
@@ -870,4 +887,4 @@ def main():
         print('==========================流程十一结束==============================')
     except:
         commonFuc().check_text_exist_result_text('error', '1')
-# main()
\ No newline at end of file
+# main()

common/db/sql/sql_tools.py

@@ -471,5 +471,18 @@ def process_date(str1):
     #
     print(date)  # 输出: 2023-03-14
     return date
+
+def get_last_auditor(order_no):
+    db, cursor = get_sql_conn()
+    cursor.execute("select last_auditor from mcms_pur_plan  where order_no='%s';"%order_no)
+    results = cursor.fetchone()
+    str1 = str(results)
+    new_str1 = str1.replace(',)', '')
+    new_str1 = new_str1.replace('(', '')
+    new_str1 = new_str1.replace(',', '')
+    new_str1 = new_str1.replace("'", '')
+    # print(new_str1)
+    cursor.close()
+    return new_str1
 # hos_goods_id = 'h034700004220'
 # main2(hos_goods_id)
\ No newline at end of file

data/b5_spd3_core_business_flow/message13

@@ -8,28 +8,29 @@
       taskType: 1
       sourceOrgId: p1e37e
       sourceOrgName: 国药集团公司sya!$
-      sourceOrderNo: PSh0347202408020015
-      billMode: '25'
+      sourceOrderNo: PSh0347202408020018
+      billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202408020015
+      sourceId: PSh0347202408020018
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: SSSQ202408020375
-      purOrderNo: SSTZ202408020350
+      planOrderNo: PLAN2024080234249
+      purOrderNo: CG2024080222467
       recOrgId: ea59fe790acd41719499e7278b8bb50b
       recOrgName: 二级检验科002
-      billRelationJson: '{"operationApplyOrderNo":"SSSQ202408020375","operationNoticeBillId":"Nh034720240802000005","distrBillId":"PSh0347202408020015","operationNoticeOrderNo":"SSTZ202408020350","distrOrderNo":"PSh0347202408020015","operationApplyBillId":"Oh034720240802000008"}'
-      taskDate: '2024-08-02 15:09:47'
+      billRelationJson: '{"buyBillId":"Bh03472024080200018","planBillId":"Ph034720240802030894","planOrderNo":"PLAN2024080234249","buyOrderNo":"BUY2024080210259","purOrderNo":"CG2024080222467","purBillId":"Ch034720240802000043","purBillDate":"2024-08-02
+        15:29:47","distrBillId":"PSh0347202408020018","distrOrderNo":"PSh0347202408020018"}'
+      taskDate: '2024-08-02 15:30:30'
       taskDateStart:
       taskDateEnd:
       billModeList:
       viewIdList:
-      supplierFlag: false
+      supplierFlag: true
       tbStatus: 20
-      remark:
+      remark: ''
       pdaFlag:
   list_b:
   - *id001

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024080200013
-  CHECK_NO2: CHECKh03472024080200013
+  CHECK_NO1: CHECKh03472024080200017
+  CHECK_NO2: CHECKh03472024080200017