流程二脚本提交

air_case/b6_spd3_core_business_flow_database_check/a_a4_流程四_基础模块设置_数据库验证.air/a_a4_流程四_基础模块设置_数据库验证.py

@@ -225,13 +225,14 @@ def check_mcms_dept_goods_info():
 
     # 要验证的数据sql
     for i in range(5):
-        sql1 = "select * from mcms_dept_goods_info  order by create_time desc LIMIT 1 OFFSET %s;" % (
-            i)
+        print('===============第'+str(i)+'个产品信息================================')
+        sql1 = "select * from mcms_dept_goods_info  where branch_id='%s' and dept_name='二级检验科002'   order by HOS_GOODS_ID desc LIMIT 1 OFFSET %s;" % (
+            branch_id,i)
         actual = check_mcms_pur_sql(sql1)
         print('actual', actual)
         id = get_id(
-            "select id from mcms_dept_goods_info  order by create_time desc LIMIT 1 OFFSET %s;" % (
-                i))
+            "select id from mcms_dept_goods_info  where branch_id='%s' and dept_name='二级检验科002'   order by HOS_GOODS_ID desc LIMIT 1 OFFSET %s;" % (
+            branch_id,i))
         hos_goods_id = get_id(
             "select hos_goods_id from mcms_dept_goods_info  where id='%s';" % (
                 id))

air_case/b6_spd3_core_business_flow_database_check/a_a5流程五_中心库入库结算_正结算1_提交采购计划_数据库验证.air/a_a5流程五_中心库入库结算_正结算1_提交采购计划_数据库验证.py

@@ -175,7 +175,7 @@ def check_mcms_mcms_pur_plan_detail(id, type, planOrderNo):
             get_id("select goods_code from mcms_pur_plan_detail where hos_goods_id='%s' and  id='%s';" % (
                 hos_goods_id, id2)))
         pkg_def_id = process_tuple(
-            get_id("select pkg_def_id from mcms_pkg where hos_goods_id='%s' LIMIT 1;" % hos_goods_id))
+            get_id("select pkg_def_id from mcms_dept_goods_info where hos_goods_id='%s' and dept_name='%s' and  branch_id='%s' LIMIT 1;" % (hos_goods_id,dept_name2,branch_id)))
         supply_id = process_tuple(
             get_id("select supply_id from mcms_pur_plan_detail where hos_goods_id='%s' and  id='%s';" % (
                 hos_goods_id, id2)))
@@ -594,7 +594,6 @@ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a5流程五_中心库
 from a_a5流程五_中心库入库结算_正结算1_提交采购计划 import goods_move3,get_GoodsPkgDef, low_vaule_purchase_plan, approval_center, hight_vaule_purchase_plan,reagent_purchase_plan
 
 def main():
-    try:
         token, projectCode1, uxid1, corpId1, info1 = call_login(2)
         updateUserLoginDefaultRange(get_listUserMgrRangePage(1))  # 设置登录账号默认权限是1级库
         goods_move3(token)
@@ -622,9 +621,11 @@ def main():
         time.sleep(6)
         check_mcms_purchase(66)  # 检查试剂采购订单数据
         commonFuc().check_text_exist_result_text('succees', 'succees')
-    except Exception as e:
-        # print('出现错误,请检查脚本或者数据')
-        print(f"发生错误: {e}")
-        print("发生异常：", str(e))
 
-main()
\ No newline at end of file
+
+
+try:
+    main()
+except Exception as e:
+        # print('出现错误,请检查脚本或者数据')
+     print("发生异常：", str(e))
\ No newline at end of file

common/db/sql/sql_tools.py

@@ -362,7 +362,7 @@ def get_supply_id(hos_goods_id):
 
 def get_pkg_def_id(hos_goods_id):
     db, cursor = get_sql_conn()
-    cursor.execute("select pkg_def_id from mcms_pkg where hos_goods_id='%s'" % hos_goods_id)
+    cursor.execute("select pkg_def_id from mcms_dept_goods_info where hos_goods_id='%s' LIMIT 1 OFFSET 1;" % hos_goods_id)
     results = cursor.fetchone()
     cursor.close()
     db.close()

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202411050123
-  cname: 国药集团公司PmXHC
+  e_id: CR202411050131
+  cname: 国药集团公司ilX2W

data/a5_mdm3_pdm/message2

 产品审核信息:
-  MSPid: MSP2411050026_1
+  MSPid: MSP2411050032_1
   hosId: h0347
-  hosGoodsId: h034700005854
-  provGoodsid: provGood-99223165
-  goodsAuditBillId: MSP2411050026
-  targetId: MSP2411050026_1
+  hosGoodsId: h034700005860
+  provGoodsid: provGood-99223171
+  goodsAuditBillId: MSP2411050032
+  targetId: MSP2411050032_1

data/b2_herp3_bs/message

 院区新增:
-  branch_id: h0347-3769
-  branch_name: 东土城路院区OiMGv
+  branch_id: h0347-3776
+  branch_name: 东土城路院区fjGyN
 科室信息:
-  dept2_id: 834b177bda914214b5d447bc8e666b93
+  dept2_id: a2c11b67a0fd481eac962e104cef2cac
   dept2_name: 二级检验科002

data/b2_herp3_bs/message3

 用户名信息:
-  username1: 自动化测试beszx
-  username2: 自动化测试beszx
+  username1: 自动化测试y9*o&
+  username2: 自动化测试y9*o&

data/b2_herp3_bs/message4

 一级科室信息:
-  dept1_id: 9d59244d8044496c8fc591fb6c4f91eb
+  dept1_id: 35c4f33335e44b5a8feb68461bce8bb3
   dept1_name: 设备科001

data/b2_herp3_bs/message6

 所有科室id:
-  deptid1: 104f2221d2d84b24964925b7c1502a62
-  deptid2: ba1eecfc37564ba99e4abf45837f229a
-  deptid3: 79788dd3488a4612af42120208fb80c7
-  deptid4: 160930dc572a4cc58fa6505d7e7d287e
+  deptid1: 35c4f33335e44b5a8feb68461bce8bb3
+  deptid2: a2c11b67a0fd481eac962e104cef2cac
+  deptid3: b726f9b3c22646b49a5e527dcfb42994
+  deptid4: 17826ef304c645a29881ac9f66296de8
 所有科室name:
   deptid1: 设备科001
   deptid2: 二级检验科002

data/b2_herp3_bs/message7

 shelfinfo:
-  shelfid: ab5560c1d9df4ebdaff41b6482d6be16
-  shelfCode: areah03472670
+  shelfid: 59b387569c1448d6bb30a14a7411e358
+  shelfCode: areah03472702
   areaName: 自动化测试

data/b5_spd3_core_business_flow/message

 供货关系申请2:
-  e_corpId: p1e4f6
+  e_corpId: p1e4f9
   h_corpId: h0347
-  e_username: 国药集团公司Mmh4l
+  e_username: 国药集团公司ilX2W
   h_name: test_1

data/b5_spd3_core_business_flow/message1

 产品审核信息:
-  MSPid: MSP2411050022_1
+  MSPid: MSP2411050028_1
   hosId: h0347
-  hosGoodsId: h034700005850
-  provGoodsid: provGood-99223161
-  goodsAuditBillId: MSP2411050022
-  targetId: MSP2411050022_1
+  hosGoodsId: h034700005856
+  provGoodsid: provGood-99223167
+  goodsAuditBillId: MSP2411050028
+  targetId: MSP2411050028_1

data/b5_spd3_core_business_flow/message11

 采购计划单号高值:
-  orderNo1: PLAN2024110130552
-  orderNo2: PLAN2024110130552
+  orderNo1: PLAN2024110532964
+  orderNo2: PLAN2024110532964

data/b5_spd3_core_business_flow/message12

 采购计划单号试剂:
-  orderNo1: PLAN2024110130551
-  orderNo2: PLAN2024110130551
+  orderNo1: PLAN2024110532965
+  orderNo2: PLAN2024110532965

data/b5_spd3_core_business_flow/message2

 产品审核信息:
-  MSPid: MSP2411050023_1
+  MSPid: MSP2411050029_1
   hosId: h0347
-  hosGoodsId: h034700005851
-  provGoodsid: provGood-99223162
-  goodsAuditBillId: MSP2411050023
-  targetId: MSP2411050023_1
+  hosGoodsId: h034700005857
+  provGoodsid: provGood-99223168
+  goodsAuditBillId: MSP2411050029
+  targetId: MSP2411050029_1

data/b5_spd3_core_business_flow/message3

 产品审核信息:
-  MSPid: MSP2411050024_1
+  MSPid: MSP2411050030_1
   hosId: h0347
-  hosGoodsId: h034700005852
-  provGoodsid: provGood-99223163
-  goodsAuditBillId: MSP2411050024
-  targetId: MSP2411050024_1
+  hosGoodsId: h034700005858
+  provGoodsid: provGood-99223169
+  goodsAuditBillId: MSP2411050030
+  targetId: MSP2411050030_1

data/b5_spd3_core_business_flow/message4

 产品审核信息:
-  MSPid: MSP2411050025_1
+  MSPid: MSP2411050031_1
   hosId: h0347
-  hosGoodsId: h034700005853
-  provGoodsid: provGood-99223164
-  goodsAuditBillId: MSP2411050025
-  targetId: MSP2411050025_1
+  hosGoodsId: h034700005859
+  provGoodsid: provGood-99223170
+  goodsAuditBillId: MSP2411050031
+  targetId: MSP2411050031_1

data/b5_spd3_core_business_flow/message5

 产品审核信息:
-  MSPid: MSP2411050026_1
+  MSPid: MSP2411050032_1
   hosId: h0347
-  hosGoodsId: h034700005854
-  provGoodsid: provGood-99223165
-  goodsAuditBillId: MSP2411050026
-  targetId: MSP2411050026_1
+  hosGoodsId: h034700005860
+  provGoodsid: provGood-99223171
+  goodsAuditBillId: MSP2411050032
+  targetId: MSP2411050032_1

data/b5_spd3_core_business_flow/message6

 产品包装信息:
-  unitPackageid1: a02ba5c949994d9fbaf0c9c9f8d1fe1a
-  unitPackageid2: a02ba5c949994d9fbaf0c9c9f8d1fe1a
+  unitPackageid1: 08ff123f494842fb8d0234ebc33a314f
+  unitPackageid2: 08ff123f494842fb8d0234ebc33a314f

data/b5_spd3_core_business_flow/message7

 采购计划单号:
-  orderNo1: PLAN2024110130550
-  orderNo2: PLAN2024110130550
+  orderNo1: PLAN2024110532963
+  orderNo2: PLAN2024110532963