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

air_case/public1/public1/public1.py

@@ -1890,6 +1890,7 @@ def get_stockAreaId_new_fromDb(deptName, type=1):
     # 中心库房名称
         branch_name = FileUtils().r_info(module, '院区新增')["branch_name"]
         stockId = get_stockId_fromdb(branch_name + '中心库房')
+        deptName = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid1']
     # 二级库房名称
     elif type == 2:
         stockId = get_stockId_fromdb(deptName + '库房')
@@ -1901,6 +1902,7 @@ def get_stockAreaId_new_fromDb(deptName, type=1):
     # 获取库房id==========结束============
 
     # ====获取库区id===== 开始==========
+
     sql="select shelf_code from mcms_stock_shelf where stock_Id='%s'and address='%s';"%(stockId,deptName)
     print(sql)
     shelfCode=get_id(sql)

common/db/sql/sql_tools.py

@@ -411,6 +411,26 @@ def get_distrOrderNo(branch_id,bill_mode):
         "select order_no from hdi_distr a where id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
             get_distrBillId(branch_id,bill_mode), bill_mode))
     return distr_order_no
+def get_checkBillId(branch_id,bill_mode):
+    checkBillId=get_id(
+        "select id from  mcms_check where branch_id='%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
+             branch_id,bill_mode))
+    return checkBillId
+def get_checkOrderNo(branch_id,bill_mode):
+    checkOrderNo=get_id(
+        "select order_no from mcms_check a where id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
+            get_checkBillId(branch_id,bill_mode), bill_mode))
+    return checkOrderNo
+def get_psiInBillId(branch_id,bill_mode):
+    psiInBillId=get_id(
+        "select id from  mcms_psi where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_YS' order by create_time desc LIMIT 1;" % (
+             branch_id,bill_mode))
+    return psiInBillId
+def get_psiInOrderNo(branch_id,bill_mode):
+    psiInOrderNo=get_id(
+        "select order_no from mcms_psi a where id = '%s' and bill_mode='%s' order by create_time desc LIMIT 1;" % (
+            get_psiInBillId(branch_id,bill_mode), bill_mode))
+    return psiInOrderNo
 def check_in_check_mcms_purchase(sql):
     db, cursor = get_sql_conn()
     cursor.execute(sql)

data/b5_spd3_core_business_flow/message15

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