优化调整脚本

air_case/b5_spd3_core_business_flow/a_a9流程六_中心库入库结算_负结算.air/a_a9流程六_中心库入库结算_负结算.py

@@ -220,6 +220,7 @@ def center_warehouse_return():
     # ========出库复核提交
 
 def main():
+    updateUserLoginDefaultRange(get_listUserMgrRangePage(1))  # 设置登录账号默认权限是1级库
     try:
         # test1() # 提交采购计划   # 外网配送   # 内网验收入库结算
         # 先查询所有的部门信息写入文件

air_case/b5_spd3_core_business_flow/a_b7流程十四退库业务_消耗退库.air/a_b7流程十四退库业务_消耗退库.py

@@ -173,7 +173,7 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
         print('result', result)
     elif type == 1:
         print('低值耗材消耗出库')
-        udi_code = get_udi2(1)
+        udi_code = get_udi2(1,token)
         data1 = pickScan4(udi_code)
         # 获取必要信息
         areaCode = commonFuc().analysis_json('areaCode', data1)

air_case/b6_spd3_core_business_flow_database_check/a_b7流程十四退库业务_消耗退库_数据库验证.air/a_b7流程十四退库业务_消耗退库_数据库验证.py

@@ -829,7 +829,7 @@ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b7流程十
 using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b7流程十四退库业务_消耗退库.air')
 from a_b7流程十四退库业务_消耗退库 import sCan_grant,second_dept_consume_Out_Stock,second_dept_consume_in_Stock
 try:
-    # updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))  # 设置登录账号默认权限是二级库
+    updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))  # 设置登录账号默认权限是二级库
     # sCan_grant(1)  # 低值扫码发放
     # check_mcms_psi_dept_out_and_in(16,10)
     # sCan_grant(3)  # 试剂扫码发放
@@ -837,7 +837,7 @@ try:
     # second_dept_consume_Out_Stock(2)  # 高值消耗出库
     # second_dept_consume_in_Stock(2)  # 高值消耗退货入库
     # check_mcms_psi_dept_out_and_in(20, 20)   #检查高值消耗出库单和消耗入库单
-    # second_dept_consume_Out_Stock(1)  # 低值消耗出库
+    second_dept_consume_Out_Stock(1)  # 低值消耗出库
 
     second_dept_consume_in_Stock(1)  # 低值消耗退回入库
     check_mcms_psi_dept_XH_CK(10,16)

air_case/public1/public1/public1.py

@@ -716,7 +716,7 @@ def call_login(type=1):  # type=1外网登录 2内网登录
 def get_udi1(type=1):  # 库存明细查询获取条码
     # type=1低值 2高值 3试剂
     module = "b5_spd3_core_business_flow"
-    token, projectCode1, uxid1, corpId1, info1 = call_login()
+    token, projectCode1, uxid1, corpId1, info1 = call_login(2)
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "mcmsInvoice_barcode_url")
     print('get_udi', url)
     # 获取请求头信息
@@ -878,7 +878,7 @@ def get_udi2(type=1,token='token'):  # 二级科室库存明细查询获取条
 def get_udi3(type=1):  # 三级科室库存明细查询获取条码
     # type=1低值 2高值 3试剂
     module = "b5_spd3_core_business_flow"
-    token, projectCode1, uxid1, corpId1, info1 = call_login()
+    token, projectCode1, uxid1, corpId1, info1 = call_login(2)
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                              "herpService_stock_barcode_page_url")
     print('get_udi', url)
@@ -975,7 +975,7 @@ def get_udi_bydb(type=1):  # 通过数据库获取中心库退货出库扫条码
     pkgCodeSee = get_id(sql)
     pkgcode = pkgCodeSee
     module = "b5_spd3_core_business_flow"
-    token, projectCode1, uxid1, corpId1, info1 = call_login()
+    token, projectCode1, uxid1, corpId1, info1 = call_login(2)
     # 获取请求头信息
     headers = commonFuc().get_business_data(module, "json_headers2",
                                             commonFuc().get_business_data(module, "json_contentType"), token,
@@ -1012,7 +1012,7 @@ def get_udi_bydb(type=1):  # 通过数据库获取中心库退货出库扫条码
 def get_udi(type=1):  # 退货出库扫条码
     # type=1低值 2高值 3试剂
     module = "b5_spd3_core_business_flow"
-    token, projectCode1, uxid1, corpId1, info1 = call_login()
+    token, projectCode1, uxid1, corpId1, info1 = call_login(2)
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "mcmsInvoice_barcode_url")
     print('get_udi', url)
     # 获取请求头信息

data/b5_spd3_core_business_flow/message13

@@ -8,29 +8,28 @@
       taskType: 1
       sourceOrgId: p1e37e
       sourceOrgName: 国药集团公司sya!$
-      sourceOrderNo: PSh0347202408050033
-      billMode: '66'
+      sourceOrderNo: PSh0347202408050044
+      billMode: '25'
       stockKind:
       purMode:
-      sourceId: PSh0347202408050033
+      sourceId: PSh0347202408050044
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024080534400
-      purOrderNo: CG2024080522576
-      recOrgId: c30ca7fe7c0f4ba8b6398caeb387bd3b
-      recOrgName: 设备科001
-      billRelationJson: '{"planBillId":"Ph034720240805031045","planOrderNo":"PLAN2024080534400","purOrderNo":"CG2024080522576","purBillId":"Ch034720240805000075","purBillDate":"2024-08-05
-        10:23:39","distrBillId":"PSh0347202408050033","distrOrderNo":"PSh0347202408050033"}'
-      taskDate: '2024-08-05 10:24:11'
+      planOrderNo: SSSQ202408050377
+      purOrderNo: SSTZ202408050355
+      recOrgId: ea59fe790acd41719499e7278b8bb50b
+      recOrgName: 二级检验科002
+      billRelationJson: '{"operationApplyOrderNo":"SSSQ202408050377","operationNoticeBillId":"Nh034720240805000002","distrBillId":"PSh0347202408050044","operationNoticeOrderNo":"SSTZ202408050355","distrOrderNo":"PSh0347202408050044","operationApplyBillId":"Oh034720240805000002"}'
+      taskDate: '2024-08-05 12:21:28'
       taskDateStart:
       taskDateEnd:
       billModeList:
       viewIdList:
       supplierFlag: false
       tbStatus: 20
-      remark: ''
+      remark:
       pdaFlag:
   list_b:
   - *id001

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024080500027
-  CHECK_NO2: CHECKh03472024080500027
+  CHECK_NO1: CHECKh03472024080500038
+  CHECK_NO2: CHECKh03472024080500038