Merge remote-tracking branch 'remotes/origin/core_folw'

# Conflicts:
#	data/b5_spd3_core_business_flow/message10
#	data/b5_spd3_core_business_flow/message11
#	data/b5_spd3_core_business_flow/message12
#	data/b5_spd3_core_business_flow/message13
#	data/b5_spd3_core_business_flow/message14
#	data/b5_spd3_core_business_flow/message15
#	data/b5_spd3_core_business_flow/message8
#	data/b5_spd3_core_business_flow/message9

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

@@ -347,7 +347,7 @@ def main():
         deptName3 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3']
         # 设置库区联系人
         set_stockShelf_Linkman(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid3"],
-                               get_stockAreaId2_new_fromDb(deptName3, 2))  # 设置库区联系人
+                               get_stockAreaId2_new_fromDb(deptName3, 3))  # 设置库区联系人
 
         #三级科室产品分配
         dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'])

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

@@ -335,7 +335,10 @@ try:
     set_dept_lead_new(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid3"])  # 设置二级科室负责人
     get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],
                         FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'], 3)
-    set_stockShelf_Linkman()  # 设置库区联系人
+    deptName3 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3']
+    # 设置库区联系人
+    set_stockShelf_Linkman(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid3"],
+                           get_stockAreaId2_new_fromDb(deptName3, 3))  # 设置库区联系人
     #三级科室产品分配
     dept_goods_distribute(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'])
 

common/db/sql/sql_tools.py

@@ -354,16 +354,19 @@ def get_planOrderNo(hos_goods_id):
                 "select order_no from spd3_herp_test2.mcms_pur_plan_detail  where hos_goods_id='%s' order by create_time desc  LIMIT 1;" % (
                     hos_goods_id)))
 
-def get_purBillDate(branch_id,bill_mode):
+
+
+def get_ext_info(branch_id,bill_mode):
     distr_main_key = get_id(
         "select id from hdi_distr a where branch_id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
             branch_id, bill_mode))
-    bill_relation_json = get_id(
-        "select bill_relation_json from hdi_distr a where id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
+    ext_info = get_id(
+        "select ext_info from hdi_distr a where id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
             distr_main_key, bill_mode))
     # print(bill_relation_json)
-    return bill_relation_json
-def get_ext_info(branch_id,bill_mode):
+    return ext_info
+
+def get_purBillDate(branch_id,bill_mode):
     distr_main_key = get_id(
         "select id from hdi_distr a where branch_id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
             branch_id, bill_mode))
@@ -372,7 +375,24 @@ def get_ext_info(branch_id,bill_mode):
             distr_main_key, bill_mode))
     # print(bill_relation_json)
     return ext_info
-
+def get_purBillDate2(branch_id,bill_mode):
+    main_key = get_id(
+        "select id from mcms_psi a where target_branch_id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
+            branch_id, bill_mode))
+    bill_relation_json = get_id(
+        "select bill_relation_json from mcms_psi a where id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
+            main_key, bill_mode))
+    # print(bill_relation_json)
+    return bill_relation_json
+def get_mcms_chek_purBillDate(branch_id,bill_mode):
+    main_key = get_id(
+        "select id from mcms_check a where branch_id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
+            branch_id, bill_mode))
+    bill_relation_json = get_id(
+        "select bill_relation_json from mcms_check a where id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
+            main_key, bill_mode))
+    # print(bill_relation_json)
+    return bill_relation_json
 def get_distrBillId(branch_id,bill_mode):
     distr_main_key = get_id(
         "select id from hdi_distr a where branch_id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024071200059
-  CHECK_NO2: CHECKh03472024071200059
+  CHECK_NO1: CHECKh03472024072600068
+  CHECK_NO2: CHECKh03472024072600068

main1/main_text.py

@@ -189,31 +189,28 @@ def main_text():
     def flow5_flow18():
         #脚本运行前清空所有待审批数据
         approval_center_all()
-        i=1
-        while True:
-            try:
-                flow5()
-                flow6()
-                flow7()
-                flow8()
-                flow9()
-                flow10()
-                flow11()
-                flow12()
-                flow13()
-                flow14()
-                flow15()
-                flow16()
-                flow17()
-                flow18()
-            except Exception as e:
-                print('第'+str(i)+'次脚本出现异常，请检查脚本或者数据')
-                # print("发生异常：", str(e))
-                # traceback.print_exc()
-                print('第'+str(i)+'次重新运行')
-                continue
-            else:
-                break
+        try:
+            flow5()
+            flow6()
+            flow7()
+            flow8()
+            flow9()
+            flow10()
+            flow11()
+            flow12()
+            flow13()
+            flow14()
+            flow15()
+            flow16()
+            flow17()
+            flow18()
+        except Exception as e:
+            print('脚本出现异常，请检查脚本或者数据')
+            print("发生异常：", str(e))
+            traceback.print_exc()
+
+
+
     def flow11_flow18():
         flow11()
         flow12()