优化调整脚本

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

 # -*- encoding=utf8 -*-
 import traceback
 
-from air_case.public1.public1.public1 import get_hosid, get_branch_id, login, get_stockAreaId_new_fromDb
+from air_case.public1.public1.public1 import get_hosid, get_branch_id, login, get_stockAreaId_new_fromDb, call_login, \
+    updateUserLoginDefaultRange, get_listUserMgrRangePage
 from common.fileUtls import FileUtils
 from common.run_cmd_script import execute_command
 
@@ -40,19 +41,19 @@ module = "b5_spd3_core_business_flow"
 
 
 # 采购计划_低值
-def low_vaule_purchase_plan():
+def low_vaule_purchase_plan(token='token',uxid='uxid'):
     module = "b3_herp3_purchase"
-    # 登录获取用户id等信息，使用创建的用户登录===========开始
-    info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
-    print(info)
-    username1 = info['username1']
-
-    username = username1
-    ## print('医院名称',username)
-    password = commonFuc().get_business_data(module, "password")
-    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
-    # 获取token和projectCode
-    token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    # # 登录获取用户id等信息，使用创建的用户登录===========开始
+    # info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+    # print(info)
+    # username1 = info['username1']
+    #
+    # username = username1
+    # ## print('医院名称',username)
+    # password = commonFuc().get_business_data(module, "password")
+    # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # # 获取token和projectCode
+    # token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
     # 登录获取用户id等信息，使用创建的用户登录============结束
     # 获取暂存的单号=======================================
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_purPlan_insert_url")
@@ -138,19 +139,19 @@ def low_vaule_purchase_plan():
     else:
         commonFuc().check_text_exist('error', result)
 
-def approval_center():
+def approval_center(token='token'):
     module = "b2_herp3_bs"
-    # 登录获取用户id等信息，使用创建的用户登录===========开始
-    info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
-    print(info)
-    username1 = info['username1']
-
-    username = username1
-    ## print('医院名称',username)
-    password = commonFuc().get_business_data(module, "password")
-    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
-    # 获取token和projectCode
-    token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    # # 登录获取用户id等信息，使用创建的用户登录===========开始
+    # info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+    # print(info)
+    # username1 = info['username1']
+    #
+    # username = username1
+    # ## print('医院名称',username)
+    # password = commonFuc().get_business_data(module, "password")
+    # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # # 获取token和projectCode
+    # token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
     # 登录获取用户id等信息，使用创建的用户登录============结束
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "apprCenter_url")
 
@@ -196,20 +197,20 @@ def approval_center():
     else:
         commonFuc().check_text_exist('error', result)
 
-def get_GoodsPkgDef(hosGoodsId):
+def get_GoodsPkgDef(hosGoodsId,token='token'):
     # 获取院区产品id==================开始
     module = "b2_herp3_bs"
-    # 登录获取用户id等信息，使用创建的用户登录===========开始
-    info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
-    print(info)
-    username1 = info['username1']
-
-    username = username1
-    ## print('医院名称',username)
-    password = commonFuc().get_business_data(module, "password")
-    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
-    # 获取token和projectCode
-    token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    # # 登录获取用户id等信息，使用创建的用户登录===========开始
+    # info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+    # print(info)
+    # username1 = info['username1']
+    #
+    # username = username1
+    # ## print('医院名称',username)
+    # password = commonFuc().get_business_data(module, "password")
+    # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # # 获取token和projectCode
+    # token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
     # 登录获取用户id等信息，使用创建的用户登录===========结束
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "mcmsBranchGoodsInfo_url")
     print(url)
@@ -263,19 +264,19 @@ def get_GoodsPkgDef(hosGoodsId):
     titlename = ('unitPackageid1', 'unitPackageid2')
     FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '产品包装信息', titlename, 'message6')
 #高值采购计划
-def hight_vaule_purchase_plan():
+def hight_vaule_purchase_plan(token='token',uxid='uxid'):
     module = "b3_herp3_purchase"
     # 登录获取用户id等信息，使用创建的用户登录===========开始
-    info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
-    print(info)
-    username1 = info['username1']
-
-    username = username1
-    ## print('医院名称',username)
-    password = commonFuc().get_business_data(module, "password")
-    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
-    # 获取token和projectCode
-    token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    # info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+    # print(info)
+    # username1 = info['username1']
+    #
+    # username = username1
+    # ## print('医院名称',username)
+    # password = commonFuc().get_business_data(module, "password")
+    # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # # 获取token和projectCode
+    # token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
     # 登录获取用户id等信息，使用创建的用户登录============结束
     # 获取暂存的单号=======================================
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_purPlan_insert_url")
@@ -361,19 +362,19 @@ def hight_vaule_purchase_plan():
     else:
         commonFuc().check_text_exist('error', result)
 #试剂采购计划
-def reagent_purchase_plan():
+def reagent_purchase_plan(token='token',uxid='uxid'):
     module = "b3_herp3_purchase"
     # 登录获取用户id等信息，使用创建的用户登录===========开始
-    info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
-    print(info)
-    username1 = info['username1']
-
-    username = username1
-    ## print('医院名称',username)
-    password = commonFuc().get_business_data(module, "password")
-    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
-    # 获取token和projectCode
-    token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    # info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+    # print(info)
+    # username1 = info['username1']
+    #
+    # username = username1
+    # ## print('医院名称',username)
+    # password = commonFuc().get_business_data(module, "password")
+    # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # # 获取token和projectCode
+    # token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
     # 登录获取用户id等信息，使用创建的用户登录============结束
     # 获取暂存的单号=======================================
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_purPlan_insert_url")
@@ -385,7 +386,7 @@ def reagent_purchase_plan():
     print('headers', headers)
     hosGoodsId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message3')["hosGoodsId"]
 
-    get_GoodsPkgDef(hosGoodsId)  # 获取单元包id
+    get_GoodsPkgDef(hosGoodsId,token)  # 获取单元包id
     pkgDefId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品包装信息', 'message6')["unitPackageid1"]
 
     # 获取院区id
@@ -459,14 +460,14 @@ def reagent_purchase_plan():
         commonFuc().check_text_exist(0, result)
     else:
         commonFuc().check_text_exist('error', result)
-def goods_move3():  # 设置请领出库渠道为中心库
-    # # 登录获取用户id等信息，使用创建的用户登录===========开始
-    info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
-    username = info['username1']
-    password = commonFuc().get_business_data("b2_herp3_bs", "password")
-    print('username,password', username, password)
-    # # 获取token和projectCode
-    token, projectCode, uxid, corpId, info = login(username, password, 2)
+def goods_move3(token='token'):  # 设置请领出库渠道为中心库
+    # # # 登录获取用户id等信息，使用创建的用户登录===========开始
+    # info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+    # username = info['username1']
+    # password = commonFuc().get_business_data("b2_herp3_bs", "password")
+    # print('username,password', username, password)
+    # # # 获取token和projectCode
+    # token, projectCode, uxid, corpId, info = login(username, password, 2)
     # 登录获取用户id等信息，使用创建的用户登录============结束
     module = "b2_herp3_bs"
     # 设置请领出库渠道为中心库
@@ -513,42 +514,44 @@ def SERACH_goods_id(GoodsId):
                                                                                                                 result)))
     return branchGoodsId
 def main():
+    token, projectCode1, uxid1, corpId1, info1 = call_login(2)
+    updateUserLoginDefaultRange(get_listUserMgrRangePage(1))  # 设置登录账号默认权限是1级库
     try:
-        goods_move3()
+        goods_move3(token)
         # 获取低值的hosGoodsId
         hosGoodsId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
-        get_GoodsPkgDef(hosGoodsId)  # 获取单元包id
+        get_GoodsPkgDef(hosGoodsId,token)  # 获取单元包id
     except:
         print('流程五获取hosGoodsId出现错误,请检查脚本或者数据')
     try:
-        low_vaule_purchase_plan()
+        low_vaule_purchase_plan(token,uxid1)
     except Exception as e:
         print('低值采购计划提交出现错误,请检查脚本或者数据')
         print("发生异常：", str(e))
         traceback.print_exc()
     #审批
     try:
-        approval_center()
+        approval_center(token)
     except Exception as e:
         print('审批采购计划出现错误,请检查脚本或者数据')
         print("发生异常：", str(e))
     try:
-        hight_vaule_purchase_plan()
+        hight_vaule_purchase_plan(token,uxid1)
     except Exception as e:
         print('高值采购计划出现错误,请检查脚本或者数据')
         print("发生异常：", str(e))
     try:
-        approval_center()
+        approval_center(token)
     except Exception as e:
         print('审批采购计划出现错误,请检查脚本或者数据')
         print("发生异常：", str(e))
     try:
-        reagent_purchase_plan()
+        reagent_purchase_plan(token,uxid1)
     except Exception as e:
         print('试剂采购计划出现错误,请检查脚本或者数据')
         print("发生异常：", str(e))
     try:
-        approval_center()
+        approval_center(token)
     except Exception as e:
         print('审批采购计划出现错误,请检查脚本或者数据')
         print("发生异常：", str(e))

air_case/b5_spd3_core_business_flow/a_a6流程五_中心库入库结算_正结算2_外网配送.air/a_a6流程五_中心库入库结算_正结算2_外网配送.py

@@ -2,6 +2,7 @@
 import traceback
 
 from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+from air_case.public1.public1.public1 import call_login
 from common.fileUtls import FileUtils
 from common.run_cmd_script import execute_command
 from common.timeUtils import timeUtils
@@ -22,20 +23,20 @@ import time
 module = "b5_spd3_core_business_flow"
 
 
-def order_dp(type=1):
+def order_dp(type=1,token='token',projectCode='projectCode',uxid='uxid'):
     # execute_command("python runner_test.py tag id2302-5 debug mdm3")
-    # # 登录获取用户id等信息，使用创建的用户登录===========开始
-    info = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message')
-    # print(info)
-    username = info['e_username']
-
-    password = commonFuc().get_business_data("b2_herp3_bs", "password1")
-    # username = '001f90380'
-    # password='1qaz!QAZ'
-    print('username,password', username, password)
-    # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
-    # # 获取token和projectCode
-    token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    # # # 登录获取用户id等信息，使用创建的用户登录===========开始
+    # info = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message')
+    # # print(info)
+    # username = info['e_username']
+    #
+    # password = commonFuc().get_business_data("b2_herp3_bs", "password1")
+    # # username = '001f90380'
+    # # password='1qaz!QAZ'
+    # print('username,password', username, password)
+    # # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # # # 获取token和projectCode
+    # token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
     # 登录获取用户id等信息，使用创建的用户登录============结束
 
     # =========================查询待确认订单======================
@@ -222,6 +223,7 @@ def order_dp(type=1):
         # # #获取日期
     productDate = timeUtils().get_time_hms(5)
     expdtDate = timeUtils().get_time_add(190, 2)
+    username = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message')['e_username']
     if type == 1:
         request_body = commonFuc().get_business_data(module, "payload9_2_1_1", id1, id1, hosId, provId, billMode,
                                                      createUser, username, createUser, id2, hosGoodsId, mdmGoodsCode,
@@ -259,10 +261,11 @@ def order_dp(type=1):
 # ==================订单配送=====================================
 
 def main():
+    token, projectCode1, uxid1, corpId1, info1 = call_login(1)
     try:
-        order_dp(1)# 1低值
-        order_dp(2)#2高值
-        order_dp(3)#3试剂
+        order_dp(1,token,projectCode1,uxid1)# 1低值
+        order_dp(2,token,projectCode1,uxid1)#2高值
+        order_dp(3,token,projectCode1,uxid1)#3试剂
     except Exception as e:
         print('订单配送发生错误,请检查脚本或者数据')
         print("发生异常：", str(e))

air_case/b5_spd3_core_business_flow/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算.air/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算.py

@@ -248,12 +248,14 @@ def putaway():
                                             commonFuc().get_business_data(module, "json_contentType"), token,
                                             projectCode)
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "stock_in_page_url")
-    print(url)
+    print('上架入库列表查询url',url)
+
     branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"]
     hosId = branch_id[0:5]
     request_body = commonFuc().get_business_data(module, "payload6", branch_id, hosId)
+    print('上架入库列表查询request_body', request_body)
     result = commonFuc().http_post(url, request_body, headers)
-    print('result', result)
+    print('上架入库列表查询result', result)
     data = commonFuc().analysis_json('data', result)
     total = commonFuc().analysis_json('total', data)
     if total >= 1:
@@ -409,6 +411,8 @@ def putaway():
 
 
 def main():
+    token, projectCode1, uxid1, corpId1, info1 = call_login(2)
+    updateUserLoginDefaultRange(get_listUserMgrRangePage(1))  # 设置登录账号默认权限是1级库
     try:
         # 验收
         check_accept_order(1)  # 低值

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

@@ -223,15 +223,15 @@ def BuyCarSubmit():
     FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '二级库向二级库请领单号', titlename, 'message25')
 
 
-def add_dept2():
+def add_dept2(token='token'):
     module = 'b2_herp3_bs'
-    # 内网登录
-    username = commonFuc().get_business_data(module, "username")
-    # print('医院名称',username)
-    password = commonFuc().get_business_data(module, "password")
-    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
-    # 获取token和projectCode
-    token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    # # 内网登录
+    # username = commonFuc().get_business_data(module, "username")
+    # # print('医院名称',username)
+    # password = commonFuc().get_business_data(module, "password")
+    # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # # 获取token和projectCode
+    # token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
     # print( token,projectCode,uxid,corpId,info)
     # c3_新增科室_特殊科室_二级库房
     branch_id = FileUtils().r_info(module, '院区新增')["branch_id"]
@@ -250,15 +250,15 @@ def add_dept2():
     print('result', result)
 
 
-def add_new_deptinfo():
+def add_new_deptinfo(token='token'):
     module = "b2_herp3_bs"
-    # 内网登录
-    username = commonFuc().get_business_data(module, "username")
-    # print('医院名称',username)
-    password = commonFuc().get_business_data(module, "password")
-    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
-    # 获取token和projectCode
-    token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    # # 内网登录
+    # username = commonFuc().get_business_data(module, "username")
+    # # print('医院名称',username)
+    # password = commonFuc().get_business_data(module, "password")
+    # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # # 获取token和projectCode
+    # token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
     # print( token,projectCode,uxid,corpId,info)
     # b9_科室管理_科室登记_科室查询
     branch_id = FileUtils().r_info(module, '院区新增')["branch_id"]
@@ -447,8 +447,9 @@ def pick_execute():
 def main():
     try:
         # ================暂时注释======================
-        add_dept2()  # 新增一个二级科室
-        add_new_deptinfo()  # 写入科室信息到文件中
+        token, projectCode1, uxid1, corpId1, info1 = call_login(2)
+        add_dept2(token)  # 新增一个二级科室
+        add_new_deptinfo(token)  # 写入科室信息到文件中
         grants_user_new()  # 新增授权
         # 同步库房信息
         execute_command("python runner_test.py tag id2263-221 debug sit")

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

@@ -323,20 +323,20 @@ def pick_execute():
 
             # 拣货==============================
             if billMode == '16':
-                udi_code = get_udi2(1)  # 获取条码 低值1 高值2 试剂3
+                udi_code = get_udi2(1,token)  # 获取条码 低值1 高值2 试剂3
             elif billMode == '20':
-                udi_code = get_udi2(2)  # 获取条码 低值1 高值2 试剂3
+                udi_code = get_udi2(2,token)  # 获取条码 低值1 高值2 试剂3
             elif billMode == '66':
-                udi_code = get_udi2(3)  # 获取条码 低值1 高值2 试剂3
+                udi_code = get_udi2(3,token)  # 获取条码 低值1 高值2 试剂3
             else:
                 udi_code = 'udi_code'
             print('udi_code', udi_code)
             if billMode == '16':
-                targetAreaCode, sourceId = pickScan2(BH_ID, udi_code, 1)  # 低值
+                targetAreaCode, sourceId = pickScan2(BH_ID, udi_code, 1,token)  # 低值
             elif billMode == '20':
-                targetAreaCode, sourceId = pickScan2(BH_ID, udi_code, 2)  # 高值
+                targetAreaCode, sourceId = pickScan2(BH_ID, udi_code, 2,token)  # 高值
             elif billMode == '66':
-                targetAreaCode, sourceId = pickScan2(BH_ID, udi_code, 3)  # 试剂
+                targetAreaCode, sourceId = pickScan2(BH_ID, udi_code, 3,token)  # 试剂
             else:
                 targetAreaCode = 'targetAreaCode'
                 sourceId = 'sourceId'

air_case/public1/public1/public1.py

@@ -683,18 +683,34 @@ def set_dept_user(dept_id, deptName, type=1):
 
 
 def call_login(type=1):  # type=1外网登录 2内网登录
-    module = "b2_herp3_bs"
-    info = FileUtils().r_info8(module, "用户名信息", 'message3')
-    print(info)
-    username1 = info['username1']
-
-    username = username1
-    ## print('医院名称',username)
-    password = commonFuc().get_business_data(module, "password")
-    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
-    # 获取token和projectCode
-    token1, projectCode1, uxid1, corpId1, info1 = login(username, password, 2)
-    return token1, projectCode1, uxid1, corpId1, info1
+    if type==2:
+        module = "b2_herp3_bs"
+        info = FileUtils().r_info8(module, "用户名信息", 'message3')
+        print(info)
+        username1 = info['username1']
+
+        username = username1
+        ## print('医院名称',username)
+        password = commonFuc().get_business_data(module, "password")
+        # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+        # 获取token和projectCode
+        token1, projectCode1, uxid1, corpId1, info1 = login(username, password, 2)
+        return token1, projectCode1, uxid1, corpId1, info1
+    else:
+        # # 登录获取用户id等信息，使用创建的用户登录===========开始
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "供货关系申请2", 'message')
+        # print(info)
+        username = info['e_username']
+
+        password = commonFuc().get_business_data("b2_herp3_bs", "password1")
+        # username = '001f90380'
+        # password='1qaz!QAZ'
+        print('username,password', username, password)
+        # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+        # # 获取token和projectCode
+        token, projectCode, uxid, corpId, info = login(username, password,1)
+        return token, projectCode, uxid, corpId, info
+        # 登录获取用户id等信息，使用创建的用户登录============结束
 
 
 def get_udi1(type=1):  # 库存明细查询获取条码
@@ -3557,19 +3573,19 @@ def grants_user_new():
     # 获取token和projectCode
     token1, projectCode1, uxid1, corpId1, info1 = login_system(username, password).get_token()
     # 登录获取用户id等信息，使用创建的用户登录============结束
-    # 内网登录
-    username = commonFuc().get_business_data(module, "username")
-    ## print('医院名称',username)
-    password = commonFuc().get_business_data(module, "password")
-    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
-    # 获取token和projectCode
-    token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+    # # 内网登录
+    # username = commonFuc().get_business_data(module, "username")
+    # ## print('医院名称',username)
+    # password = commonFuc().get_business_data(module, "password")
+    # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # # 获取token和projectCode
+    # token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
     # print( token,projectCode,uxid,corpId,info)
 
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "sys_user_grants_url")
     # 获取请求头信息
     headers = commonFuc().get_business_data(module, "json_headers2",
-                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            commonFuc().get_business_data(module, "json_contentType"), token1,
                                             commonFuc().get_business_data(module, "X-APP-CODE"))
     userId = uxid1
     mgrBranchId = FileUtils().r_info(module, '院区新增')["branch_id"]

data/b5_spd3_core_business_flow/message13

@@ -8,27 +8,27 @@
       taskType: 1
       sourceOrgId: p1e37e
       sourceOrgName: 国药集团公司sya!$
-      sourceOrderNo: PSh0347202408020046
+      sourceOrderNo: PSh0347202408050033
       billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202408020046
+      sourceId: PSh0347202408050033
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024080234290
-      purOrderNo: CG2024080222499
-      recOrgId: ea59fe790acd41719499e7278b8bb50b
-      recOrgName: 二级检验科002
-      billRelationJson: '{"buyBillId":"Bh03472024080200061","planBillId":"Ph034720240802030935","planOrderNo":"PLAN2024080234290","buyOrderNo":"BUY2024080210302","purOrderNo":"CG2024080222499","purBillId":"Ch034720240802000075","purBillDate":"2024-08-02
-        16:37:23","distrBillId":"PSh0347202408020046","distrOrderNo":"PSh0347202408020046"}'
-      taskDate: '2024-08-02 16:37:50'
+      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'
       taskDateStart:
       taskDateEnd:
       billModeList:
       viewIdList:
-      supplierFlag: true
+      supplierFlag: false
       tbStatus: 20
       remark: ''
       pdaFlag:

data/b5_spd3_core_business_flow/message15

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