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_a4_流程四_基础模块设置.air/a_a4_流程四_基础模块设置.py

 # -*- encoding=utf8 -*-
 from air_case.public1.public1.public1 import *
+from common.dateUtils import dateUtils
 from common.db.sql.sql_del_branch_info import delData
 from common.fileUtls import FileUtils
 from common.run_cmd_script import execute_command
@@ -21,13 +22,46 @@ import time
 
 module = "b5_spd3_core_business_flow"
 
+def add_dept():
+    # 内网登录
+    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)
+    # c0_新增科室_特殊科室_设备科_中心库房
+    branch_id = FileUtils().r_info8(module, '院区新增type2','message')["院区id"]
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "dept_insert_url")
 
-def test1():
-    # 院区新增
-    execute_command("python runner_test.py tag id2263-4 debug sit")
-    # 新增科室
-    execute_command(
-        "python runner_test.py tag id2263-19,id2263-20,id2263-21,id2263-22,id2263-23,id2263-24,id2263-25,id2263-26 debug sit")
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            commonFuc().get_business_data(module, "X-APP-CODE"))
+
+    # #请求体
+    request_body = commonFuc().get_business_data(module, "payload14", branch_id)
+    print(request_body)
+    # # # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('result', result)
+    # #断言
+    checkDict = commonFuc().get_business_data(module, 'checkDict2')
+    commonFuc().check_result(checkDict, result)
+def test1(type=1):
+
+    if type==1:
+        # 院区新增
+        execute_command("python runner_test.py tag id2263-4 debug sit")
+        # 新增科室
+        execute_command(
+            "python runner_test.py tag id2263-19,id2263-20,id2263-21,id2263-22,id2263-23,id2263-24,id2263-25,id2263-26 debug sit")
+    else:
+        branch_add()
+        # 新增科室
+        execute_command(
+            "python runner_test.py tag id2263-19,id2263-20,id2263-21,id2263-22,id2263-23,id2263-24,id2263-25,id2263-26 debug sit")
     # 一键导入所有产品
     execute_command("python runner_test.py tag id2263-48 debug sit")
     #导入同步过来的新产品，防止因同步时间差导致新建的产品没有导入过来
@@ -292,13 +326,69 @@ def add_StockArea():#添加货位
         commonFuc().check_text_exist(0, result)
     else:
         commonFuc().check_text_exist('error', result)
+
+def recover_dataFile():
+    delData().Delete_branch_by_id(2)
+    delData().Delete_probeInfo_other(2)
+    pro_path = commonFuc().get_pro_path2()
+    src = pro_path + r'/data'
+    dst=FileUtils().r_info8('b5_spd3_core_business_flow', '备份路径','message29')['备份目录']
+    # 恢复目录
+    # 先删除文件夹
+    import shutil, os
+    if os.path.exists(src):
+        shutil.rmtree(src)
+    FileUtils().copy_folder_backup(dst, src)
+def branch_add():
+    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()
+    url=commonFuc().get_api_add_port_url()+commonFuc().get_business_data(module, "insert_url")
+    print('a4_院区新增',url)
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            commonFuc().get_business_data(module, "X-APP-CODE"))
+    name=commonFuc().randomString(6)#核心业务流的长度后缀设置为6位
+    #请求体
+    request_body=commonFuc().get_business_data(module, "payload",name,name)
+
+    # 发送请求
+    result = commonFuc().http_post(url, request_body,headers)
+    print('result', result)
+    #断言
+    code=commonFuc().analysis_json('code',result)
+    commonFuc().check_text_exist(0,result)
+    id1=commonFuc().analysis_json('id',commonFuc().analysis_json('data',result))
+    name=commonFuc().analysis_json('name',commonFuc().analysis_json('data',result))
+
+    #备份当前data目录
+    pro_path = commonFuc().get_pro_path2()
+    src=pro_path+r'/data'
+    dst=pro_path+r'/data'+ get_branch_name()+get_branch_id()
+    #将备份的目录路径写入到文件中
+    info = (src, dst)
+    titlename = ('源目录', '备份目录')
+    FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '院区新增',titlename,'message29')
+    #备份data文件
+    FileUtils().copy_folder_backup(src,dst)
+
+    info = (id1, name)
+    titlename = ('院区id', '院区name')
+    FileUtils().w_info2(info,module,'院区新增')
+
 def main():
     try:
         # ==============删除业务数据和报表数据
         # delData().Delete_business_Data()#删除业务数据
         # delData().Del_reporter_data() # 删除报表数据
         #==============删除业务数据和报表数据
-        test1()
+        test1()#参数2是新增院区后缀为6位数的参数1是老模式
         test2()# 科室添加产品信息(产品是从外网同步过来的)
         dept_query_all()# 科室查询，将科室id写入文件中
         grants_user()#给用户授权

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
+from air_case.public1.public1.public1 import get_hosid, get_branch_id, login, get_stockAreaId_new_fromDb
 from common.fileUtls import FileUtils
 from common.run_cmd_script import execute_command
 
@@ -22,21 +22,21 @@ import time
 module = "b5_spd3_core_business_flow"
 
 
-def login():
-    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()
-    return token, projectCode, uxid, corpId, info
-    # 登录获取用户id等信息，使用创建的用户登录============结束
+# def login():
+#     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()
+#     return token, projectCode, uxid, corpId, info
+#     # 登录获取用户id等信息，使用创建的用户登录============结束
 
 
 # 采购计划_低值
@@ -70,13 +70,15 @@ def low_vaule_purchase_plan():
     deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"]
     hospital_name = commonFuc().get_business_data(module, 'hospital_name')
     areaCode = FileUtils().r_info8('b2_herp3_bs', 'shelfinfo', 'message7')["shelfCode"]
+    # deptname1 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid1']
+    # areaCode =get_stockAreaId_new_fromDb(deptname1, 1)
     areaName = FileUtils().r_info8('b2_herp3_bs', 'shelfinfo', 'message7')["areaName"]
     recUser = uxid
 
     # # 请求体
     request_body = commonFuc().get_business_data(module, "payload1_1_1", hosGoodsId, pkgDefId, hosId, branch_id,
                                                  hospital_name, deptid1, deptid1, areaCode, areaName, recUser)
-    print('request_body', request_body)
+    print('低值采购计划request_body', request_body)
     # new_request_body = request_body.replace("'", '"')
     # new_request_body = new_request_body.replace("None", 'null')
     # # print(new_request_body)
@@ -291,6 +293,8 @@ def hight_vaule_purchase_plan():
     deptid1 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid1"]
     hospital_name = commonFuc().get_business_data(module, 'hospital_name')
     areaCode = FileUtils().r_info8('b2_herp3_bs', 'shelfinfo', 'message7')["shelfCode"]
+    # deptname1 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid1']
+    # areaCode = get_stockAreaId_new_fromDb(deptname1, 1)
     areaName = FileUtils().r_info8('b2_herp3_bs', 'shelfinfo', 'message7')["areaName"]
     recUser = uxid
 
@@ -455,9 +459,62 @@ 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)
+    # 登录获取用户id等信息，使用创建的用户登录============结束
+    module = "b2_herp3_bs"
+    # 设置请领出库渠道为中心库
+    url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "updateSettleType_url")
 
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            commonFuc().get_business_data(module, "X-APP-CODE"))
+    for i in range(1, 4):
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "产品审核信息", 'message%s' % i)
+        hosGoodsId = info['hosGoodsId']
+        GoodsId = hosGoodsId.replace(get_hosid(), '')
+        branchGoodsId = SERACH_goods_id(GoodsId)
+        # #请求体
+        request_body = commonFuc().get_business_data(module, "payload47_3", branchGoodsId, hosGoodsId, get_branch_id())
+        print(request_body)
+        # # # 发送请求
+        result = commonFuc().http_post(url, request_body, headers)
+        print('goods_move,result', result)
+def SERACH_goods_id(GoodsId):
+    # 在请领出库渠道直送中搜索产品
+    module = 'b5_spd3_core_business_flow'
+    # # 登录获取用户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等信息，使用创建的用户登录============结束\
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            commonFuc().get_business_data(module, "X-APP-CODE"))
+    url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+                                                                             "herpService_mcmsBranchGoodsInfo_page_url")
+    dept1 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid1']
+    # hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId']
+    # GoodsId = hosGoodsId.replace(get_hosid(), '')
+    request_body = commonFuc().get_business_data(module, "payload53_3", GoodsId, get_hosid(), get_branch_id(), dept1)
+    result = commonFuc().http_post(url, request_body, headers)
+    branchGoodsId = commonFuc().analysis_json('id', commonFuc().analysis_json('data', commonFuc().analysis_json('data',
+                                                                                                                result)))
+    return branchGoodsId
 def main():
     try:
+        goods_move3()
         # 获取低值的hosGoodsId
         hosGoodsId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
         get_GoodsPkgDef(hosGoodsId)  # 获取单元包id

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

@@ -117,9 +117,9 @@ def check_accept_order(type=1):
 
     sourceId = sourceOrderNo
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_wait_detail_url")
-    print('url', url)
+    print('check_wait_detail_urlurl', url)
     request_body = commonFuc().get_business_data(module, "payload1", sourceId, sourceType, billMode, branch_id)
-
+    print('check_wait_detail_url,request_body', request_body)
     # print('request_body',request_body)
     # 发送请求
     while True:

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

@@ -40,6 +40,7 @@ def center_warehouse_return():
     token, projectCode, uxid, corpId, info = login(username, password, 2)
     # 登录获取用户id等信息，使用创建的用户登录============结束
     # 到库房明细查询，查询产品的udi码
+    # get_udi_bydb(1)
     get_udi(1)
     url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_pick_submit_url")
     print('url', url)

air_case/demo/产品检查.air/产品检查.py

 # -*- encoding=utf8 -*-
 from common.db.sql.sql_del_branch_info import delData
-from common.db.sql.sql_tools import main2
 from common.fileUtls import FileUtils
 from air_case.public1.public1.public1 import *
 
@@ -34,27 +33,47 @@ import sys
 # 第一种方式===========================
 
 
+# # 第二种方式=================================
+# hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
+# actual_value1 = main2(hos_goods_id)
+# print(actual_value1)
+# # print('actual_value2',actual_value1)
+# actual_value2 = get_process_list2(actual_value1)
+# print('actual_value2', actual_value2, type(actual_value2))
+# prov_hos_goods_id = '7be89fe4c5ee4689a5e249d3197b9947'
+# expected_value2 = commonFuc().get_business_data('b5_spd3_core_business_flow', 'expected_value2', prov_hos_goods_id)
+# expected_value2=get_process_list2(expected_value2)
+# print('expected_value2', expected_value2, type(expected_value2))
+# actual_value2 = actual_value2.replace(" ", "")
+# expected_value2 = expected_value2.replace(" ", "")
+# print(actual_value2)
+# print(expected_value2)
+#
+# print(actual_value2 == expected_value2)
+# if actual_value2 == expected_value2:
+#     print('ok')
+#     commonFuc().check_text_exist_result_text('succees', 'succees')
+# else:
+#     print('error')
+#     commonFuc().check_text_exist_result_text('error', 'succees')
 # 第二种方式=================================
-hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
-actual_value1 = main2(hos_goods_id)
-print(actual_value1)
-# print('actual_value2',actual_value1)
-actual_value2 = get_process_list2(actual_value1)
-print('actual_value2', actual_value2, type(actual_value2))
-prov_hos_goods_id = '7be89fe4c5ee4689a5e249d3197b9947'
-expected_value2 = commonFuc().get_business_data('b5_spd3_core_business_flow', 'expected_value2', prov_hos_goods_id)
-expected_value2=get_process_list2(expected_value2)
-print('expected_value2', expected_value2, type(expected_value2))
-actual_value2 = actual_value2.replace(" ", "")
-expected_value2 = expected_value2.replace(" ", "")
-print(actual_value2)
-print(expected_value2)
-
-print(actual_value2 == expected_value2)
-if actual_value2 == expected_value2:
-    print('ok')
-    commonFuc().check_text_exist_result_text('succees', 'succees')
-else:
-    print('error')
-    commonFuc().check_text_exist_result_text('error', 'succees')
-# 第二种方式=================================
+
+# 备份当前data目录
+pro_path = commonFuc().get_pro_path2()
+src = pro_path + r'/data'
+dst = pro_path + r'/data' + get_branch_name()+get_branch_id()
+#将备份的目录路径写入到文件中
+info = (src, dst)
+titlename = ('源目录', '备份目录')
+FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '备份路径',titlename,'message29')
+#备份目录
+FileUtils().copy_folder_backup(src, dst)
+
+dst=FileUtils().r_info8('b5_spd3_core_business_flow', '备份路径','message29')['备份目录']
+#恢复目录
+#先删除文件夹
+import shutil,os
+if os.path.exists(src):
+    shutil.rmtree(src)
+
+FileUtils().copy_folder_backup(dst,src)
\ No newline at end of file

common/db/sql/sql_del_branch_info.py

@@ -9,13 +9,16 @@ from common.fileUtls import FileUtils
 
 class delData(object):
 
-    def Delete_branch_by_id(self):
+    def Delete_branch_by_id(self,type=1):
         connection = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd3_herp_test2",
                                      charset="utf8")
         cursor = connection.cursor()
         # 删除新增的院区数据,减少垃圾数据的产生,保证脚本下次还可以正常运行,接口脚本每次都使用新增数据
         # sql = "DELETE from mcms_branch_info where id = '%s';" % id
-        sql = "DELETE  from mcms_branch_info where  name  like '%东土城路院区_____';"
+        if type==1:
+            sql = "DELETE  from mcms_branch_info where  name  like '%东土城路院区_____';"
+        else:
+            sql = "DELETE  from mcms_branch_info where  name  like '%东土城路院区______';"
         print(sql)
         cursor.execute(sql)
         cursor.execute("commit;")
@@ -28,7 +31,10 @@ class delData(object):
         cursor = connection.cursor()
         # 删除新增的院区数据,减少垃圾数据的产生,保证脚本下次还可以正常运行,接口脚本每次都使用新增数据
         # sql = "DELETE from mcms_branch_info where id = '%s';" % id
-        sql = "DELETE  from mcms_branch_info where  name  like '%东土城路院区_____';"
+        if type == 1:
+            sql = "DELETE  from mcms_branch_info where  name  like '%东土城路院区_____';"
+        else:
+            sql = "DELETE  from mcms_branch_info where  name  like '%东土城路院区______';"
         print(sql)
         cursor.execute(sql)
         cursor.execute("commit;")
@@ -136,12 +142,15 @@ class delData(object):
         # print('多余库房信息删除成功 ')
         cursor.close()
 
-    def Delete_probeInfo_other(self):
+    def Delete_probeInfo_other(self,type=1):
         connection = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd3_herp_test2",
                                      charset="utf8")
         cursor = connection.cursor()
         # 删除多余库房信息
-        sql = "delete  from mcms_stock_info where stock_name like '%东土城路院区_____中心库房';"
+        if type==1:
+            sql = "delete  from mcms_stock_info where stock_name like '%东土城路院区_____中心库房';"
+        else:
+            sql = "delete  from mcms_stock_info where stock_name like '%东土城路院区______中心库房';"
         print(sql)
         cursor.execute(sql)
         cursor.execute("commit;")

common/fileUtls.py

@@ -306,8 +306,46 @@ class FileUtils(object):
                 return None
         else:
             return None
+    def r_info9(self, module, keyname, message_no):
+        w_path = rootPath + os.sep + 'data' + os.sep + module
+        yamlpath = os.path.join(w_path, message_no)
+        try:
+            file_value = open(yamlpath, 'r', encoding='utf-8')
+        except:
+            file_value = open(yamlpath, 'w', encoding='utf-8')
+            file_value = open(yamlpath, 'r', encoding='utf-8')
+        result = yaml.load(file_value.read(), Loader=yaml.Loader)
+        if result is not None:
+           return result
+        else:
+            return None
+    def w_info9(self, module,content,message_no):
+        module = module
+        dict = content
+
+        w_path = rootPath + os.sep + 'data' + os.sep + module
+        # print(w_path)
+        yamlpath = os.path.join(w_path, message_no)
+        # 写入到yaml文件
+        with open(yamlpath, "a", encoding="utf-8") as f:
+            yaml.dump(dict, f, Dumper=yaml.RoundTripDumper, allow_unicode=True)
+    def copy_folder_backup(self,src,dst):
+        import shutil
+        import os
 
+        if os.path.exists(dst):
+            print(f"The backup directory '{dst}' already exists.")
+            return
+
+        try:
+            shutil.copytree(src, dst)
+            print(f"Folder '{src}' backed up successfully to '{dst}'.")
+        except OSError as e:
+            print(f"Error: {e}")
 
+        # 使用方法
+        # 假设你要备份的文件夹是 '/path/to/source'，备份的目标文件夹是 '/path/to/backup'
+        # copy_folder_backup('/path/to/source', '/path/to/backup')
 if __name__ == '__main__':
     # info=("aaaa","bbbbbb","mdm3-pim")
     # FileUtils().w_info(info,"产品新增")

data/b3_herp3_purchase/data

@@ -71,9 +71,10 @@ json_headers2: {
   "X-APP-CODE":"%s"
 }
 "payload": '{"purPlanDetail":[{"hosGoodsId":"h034700001977","pkgDefId":"22513b84dad7418fb445e5de02fa88f0","pkgDefName":"大包","pkgDefQty":20,"planPkgQty":0},{"hosGoodsId":"h034700001977","pkgDefId":"3c2b4432415e46c4aebb018969c3dcc0","pkgDefName":"小包","pkgDefQty":15,"planPkgQty":0},{"hosGoodsId":"h034700001977","pkgDefId":"56b010aba2e04f978e3038c0f53d910c","pkgDefName":" 包","pkgDefQty":33,"planPkgQty":800},{"hosGoodsId":"h034700001977","pkgDefId":"f8ad68aae4a5406ab04316e46bbf38bd","pkgDefName":"包2","pkgDefQty":66,"planPkgQty":0}],"hosId":"h0347","branchId":"h0347-2011","mgrCorpName":"邹城市人民医院(test)","deptName":"","deptId":"d69a68df361a4289b2262e4ef75b55a5","recOrgId":"d69a68df361a4289b2262e4ef75b55a5","recOrgName":"","areaCode":"areah03470414","areaName":"A库区","recUser":"UID-050151","recPhone":"xhs1009","recAddr":"A","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}'
-"payload1_1_1": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":"%s","pkgDefName":"100","pkgDefQty":100,"planPkgQty":100}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"自动化测试","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
-"payload1_1_2": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":null,"pkgDefName":"包","pkgDefQty":1,"planPkgQty":100}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"自动化测试","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
-"payload1_1_3": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":"%s","pkgDefName":"100","pkgDefQty":100,"planPkgQty":100}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"自动化测试","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
+#"payload1_1_1": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":"%s","pkgDefName":"100","pkgDefQty":100,"planPkgQty":100}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"自动化测试","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
+"payload1_1_1": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":"%s","pkgDefName":"100","pkgDefQty":100,"planPkgQty":100,"codingType":0}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"设备科001","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
+"payload1_1_2": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":null,"pkgDefName":"包","pkgDefQty":1,"planPkgQty":100,"codingType":0}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"自动化测试","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
+"payload1_1_3": {"purPlanDetail":[{"hosGoodsId":"%s","pkgDefId":"%s","pkgDefName":"100","pkgDefQty":100,"planPkgQty":100,"codingType":0}],"hosId":"%s","branchId":"%s","mgrCorpName":"%s","deptName":"","deptId":"%s","recOrgId":"%s","recOrgName":"","areaCode":"%s","areaName":"%s","recUser":"%s","recPhone":"xhs","recAddr":"自动化测试","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}
 
 
 "payload_1": '{"purPlanDetail":[{"hosGoodsId":"h034700001947","pkgDefId":null,"pkgDefName":"包","pkgDefQty":1,"planPkgQty":888}],"hosId":"h0347","branchId":"h0347-2011","mgrCorpName":"邹城市人民医院(test)","deptName":"","deptId":"d69a68df361a4289b2262e4ef75b55a5","recOrgId":"d69a68df361a4289b2262e4ef75b55a5","recOrgName":"","areaCode":"areah03470414","areaName":"A库区","recUser":"UID-050151","recPhone":"xhs1009","recAddr":"A","remark":"","sourceType":"","createType":"SG","checkLcTaskQty":true}'
@@ -94,9 +95,9 @@ json_headers2: {
 "payload10": '{"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":999,"pkgDefQty":1,"provId":"p00001603","provName":"北京中杉金桥生物技术有限公司(test)","subProvId":"p56a4","subProvName":"国药集团浙江医疗器材有限公司","hosGoodsId":"h034700001757","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}'
 "payload11": {"pid":"%s","hosGoodsName":"","hosGoodsSpec":"","provName":"","purModes":[],"subProvName":""}
 "payload12": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":800,"pkgDefQty":33,"provId":"p10d95","provName":"浙江高仰医疗科技有限公司","subProvId":"p10d95","subProvName":"浙江高仰医疗科技有限公司","hosGoodsId":"h034700001977","purMode":10,"version":0,"pkgDefId":"56b010aba2e04f978e3038c0f53d910c","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
-"payload12_1_1": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":10,"version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
-"payload12_1_2": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":1,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
-"payload12_1_3": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":60,"version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
+"payload12_1_1": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":10,"version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":null,"codingType":0}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
+"payload12_1_2": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":1,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null,"codingType":0}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
+"payload12_1_3": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":100,"pkgDefQty":100,"provId":"%s","provName":"%s","subProvId":"%s","subProvName":"%s","hosGoodsId":"%s","purMode":60,"version":0,"pkgDefId":"%s","purTaskId":null,"sourceId":null,"codingType":0}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
 
 "payload13": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":3,"planPkgQty":888,"pkgDefQty":1,"provId":"p10d95","provName":"浙江高仰医疗科技有限公司","subProvId":"p10d95","subProvName":"浙江高仰医疗科技有限公司","hosGoodsId":"h034700001947","purMode":20,"version":0,"pkgDefId":null,"purTaskId":null,"sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":true}
 "payload14": {"id":"%s","planDetailList":[{"closeStatus":0,"id":"%s","inSettlement":1,"planPkgQty":888,"pkgDefQty":1,"provId":"p000029d8","provName":"国药集团湖南分公司mkcQNd","subProvId":"p000029d7","subProvName":"国药集团湖北分公司mQDwR7","hosGoodsId":"h034700001859","purMode":60,"version":0,"pkgDefId":"26d93e6fecd24b6fa4bde8aeacfbf153","purTaskId":"5c85573c049141ff8df808dabc30d2b1","sourceId":null}],"tempFlag":0,"version":0,"checkLcTaskQty":false}

data/b5_spd3_core_business_flow/message13

@@ -3,33 +3,34 @@
   - &id001
     - id:
       hosId: h0347
-      branchId: h0347-3745
+      branchId: h0347-3738
       deptId:
       taskType: 1
-      sourceOrgId: p1e34a
-      sourceOrgName: 国药集团公司BCJj3
-      sourceOrderNo: PSh0347202407120066
-      billMode: '25'
+      sourceOrgId: p1e35e
+      sourceOrgName: 国药集团公司S57ui
+      sourceOrderNo: PSh0347202408010065
+      billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202407120066
+      sourceId: PSh0347202408010065
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: SSSQ202407120341
-      purOrderNo: SSTZ202407120319
-      recOrgId: e6a7862c7b3d49a69ab93979a8f32710
-      recOrgName: 二级检验科002
-      billRelationJson: '{"operationApplyOrderNo":"SSSQ202407120341","operationNoticeBillId":"Nh034720240712000002","distrBillId":"PSh0347202407120066","operationNoticeOrderNo":"SSTZ202407120319","distrOrderNo":"PSh0347202407120066","operationApplyBillId":"Oh034720240712000002"}'
-      taskDate: '2024-07-12 11:25:51'
+      planOrderNo: PLAN2024080134122
+      purOrderNo: CG2024080122381
+      recOrgId: 63c734f07fcc422ea80f49ca8e5bbd95
+      recOrgName: 设备科001
+      billRelationJson: '{"planBillId":"Ph034720240801030767","planOrderNo":"PLAN2024080134122","purOrderNo":"CG2024080122381","purBillId":"Ch034720240801000099","purBillDate":"2024-08-01
+        15:14:28","distrBillId":"PSh0347202408010065","distrOrderNo":"PSh0347202408010065"}'
+      taskDate: '2024-08-01 15:15:04'
       taskDateStart:
       taskDateEnd:
       billModeList:
       viewIdList:
-      supplierFlag: false
+      supplierFlag: true
       tbStatus: 20
-      remark:
+      remark: ''
       pdaFlag:
   list_b:
   - *id001

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024073000037
-  CHECK_NO2: CHECKh03472024073000037
+  CHECK_NO1: CHECKh03472024080100056
+  CHECK_NO2: CHECKh03472024080100056

data/b6_spd3_core_business_flow_database_check/data

@@ -19,12 +19,12 @@
 "mcms_dept_buy_detail_approval_after1": '{"id": "%s", "pid": "%s", "order_no": "%s", "order_num": 1, "source_id": None, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "price": Decimal("99.999900"), "pur_mode": 20, "pkg_def_id": %s, "pkg_def_name": %s, "pkg_def_qty": Decimal("1.00"), "buy_pkg_qty": Decimal("1.00"), "buy_qty": Decimal("1.00"), "send_pkg_qty": "0", "send_qty": "0", "rec_pkg_qty": "0", "rec_qty": "0", "tb_status": 40, "close_type": 0, "remark": None, "close_remark": None, "close_time": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "re_order_no": None, "coding_type": 0}'
 "mcms_dept_buy_detail_approval_after2": '{"id": "%s", "pid": "%s", "order_no": "%s", "order_num": 1, "source_id": None, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "price": Decimal("99.999900"), "pur_mode": 60, "pkg_def_id": "%s", "pkg_def_name": "%s", "pkg_def_qty": Decimal("100.00"), "buy_pkg_qty": Decimal("1.00"), "buy_qty": Decimal("100.00"), "send_pkg_qty": "0", "send_qty": "0", "rec_pkg_qty": "0", "rec_qty": "0", "tb_status": 40, "close_type": 0, "remark": None, "close_remark": None, "close_time": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "re_order_no": None, "coding_type": 0}'
 
-
+#配送单
 "mcms_dept_buy_direct_sending": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "area_code": "%s", "area_name": "%s", "source_id": None, "buy_way": "3", "create_type": "SG", "buy_kind": "QL", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_stock_name": "%s", "bill_expdt_date": %s, "bill_expect_date": None, "priority": 0, "buy_priority": 0, "barcode_flag": 1, "pkg_flag": 1, "remark": "", "dept_audit_remark": None, "audit_remark": None, "close_remark": None, "srv_id": None, "srv_name": None, "gen_status": 0, "close_status": 0, "tb_status": 10, "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "close_time": None, "old_order_no": None}'
 "mcms_dept_buy_direct_sending2": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "area_code": "%s", "area_name": "%s", "source_id": None, "buy_way": "3", "create_type": "SG", "buy_kind": "QL", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_stock_name": "%s", "bill_expdt_date": %s, "bill_expect_date": None, "priority": 0, "buy_priority": 0, "barcode_flag": 1, "pkg_flag": 0, "remark": "", "dept_audit_remark": None, "audit_remark": None, "close_remark": None, "srv_id": None, "srv_name": None, "gen_status": 0, "close_status": 0, "tb_status": 10, "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "close_time": None, "old_order_no": None}'
 "mcms_dept_buy_direct_sending3": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "area_code": "%s", "area_name": "%s", "source_id": None, "buy_way": "3", "create_type": "SG", "buy_kind": "QL", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_stock_name": "%s", "bill_expdt_date": %s, "bill_expect_date": None, "priority": 0, "buy_priority": 0, "barcode_flag": 1, "pkg_flag": 1, "remark": "", "dept_audit_remark": None, "audit_remark": None, "close_remark": None, "srv_id": None, "srv_name": None, "gen_status": 0, "close_status": 0, "tb_status": 10, "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "close_time": None, "old_order_no": None}'
 
-
+#科室请领单审批后
 "mcms_dept_buy_approval_after4": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "area_code": "%s", "area_name": "%s", "source_id": None, "buy_way": "3", "create_type": "SG", "buy_kind": "QL", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_stock_name": "%s", "bill_expdt_date": %s, "bill_expect_date": None, "priority": 0, "buy_priority": 0, "barcode_flag": 1, "pkg_flag": 1, "remark": "", "dept_audit_remark": "22", "audit_remark": None, "close_remark": None, "srv_id": None, "srv_name": None, "gen_status": 0, "close_status": 0, "tb_status": 40, "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": "%s", "last_audit_time": %s, "close_time": None, "old_order_no": None}'
 "mcms_dept_buy_approval_after5": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "area_code": "%s", "area_name": "%s", "source_id": None, "buy_way": "3", "create_type": "SG", "buy_kind": "QL", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_stock_name": "%s", "bill_expdt_date": %s, "bill_expect_date": None, "priority": 0, "buy_priority": 0, "barcode_flag": 1, "pkg_flag": 0, "remark": "", "dept_audit_remark": "22", "audit_remark": None, "close_remark": None, "srv_id": None, "srv_name": None, "gen_status": 0, "close_status": 0, "tb_status": 40, "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": "%s", "last_audit_time": %s, "close_time": None, "old_order_no": None}'
 "mcms_dept_buy_approval_after6": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "area_code": "%s", "area_name": "%s", "source_id": None, "buy_way": "3", "create_type": "SG", "buy_kind": "QL", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_stock_name": "%s", "bill_expdt_date": %s, "bill_expect_date": None, "priority": 0, "buy_priority": 0, "barcode_flag": 1, "pkg_flag": 1, "remark": "", "dept_audit_remark": "22", "audit_remark": None, "close_remark": None, "srv_id": None, "srv_name": None, "gen_status": 0, "close_status": 0, "tb_status": 40, "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": "%s", "last_audit_time": %s, "close_time": None, "old_order_no": None}'
@@ -167,3 +167,11 @@
 
 #拆包出库单子表试剂
 "mcms_psi_dept_batch3_1": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": "%s", "pur_mode": 60, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("100.00"), "unit_name": "100支/100", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}'
+
+#消耗出库子表
+"mcms_psi_dept_batch_xhck1": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": "%s", "pur_mode": 10, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("1.00"), "unit_name": "1支", "barcode_id": %s, "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}'
+"mcms_psi_dept_batch_xhck2": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": "%s", "pur_mode": 20, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("1.00"), "unit_name": "1支", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}'
+"mcms_psi_dept_batch_xhck3": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": "%s", "pur_mode": 60, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("1.00"), "unit_name": "1支", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}'
+
+#消耗出库主表
+"mcms_psi_dept_out_xhck1": '{"id":"%s","order_no":"%s","bill_mode":"10","rec_type":"YND","psi_flag":-1,"psi_kind":"207","stock_kind":"CK_XH","target_corp_id":"%s","target_branch_id":"%s","target_dept_id":"%s","target_dept_name":"%s","target_stock_id":"%s","target_area_code":"%s","target_area_name":"默认库区","source_id":"%s","source_no":null,"source_repl_id":null,"source_corp_id":"%s","source_branch_id":"%s","source_dept_id":"%s","source_dept_name":"%s","source_stock_id":"%s","source_area_code":"%s","source_area_name":"默认库区","consume_type":1,"patient_id":"","patient_name":"","machine_id":null,"machine_name":null,"his_charge_no":"%s","remark":null,"tb_status":30,"accounter":"%s","account_date":"%s","bill_relation_json":"{"pickOrderNo":"%s","pickBillId":"%s","psiDeptOutBillId":"%s","psiDeptOutOrderNo":"%s"}","create_user":"%s","create_time":%s,"last_modified":%s,"last_modified_user":"%s","version":1,"last_auditor":null,"last_audit_time":null,"reject_reason":null,"reject_user":null,"reject_time":null,"initial_order":null,"source_type":"SG","target_coding_type":null}'

main1/main_text.py

@@ -84,8 +84,19 @@ def main_text():
         # sys.exit(0)
     def flow4():
         # execute_command("python runner_test.py tag id2302-4 debug mdm3")
-        from execute import flow4
-        flow4()
+        # from execute import flow4
+        # flow4()
+        sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a4_流程四_基础模块设置.air')
+        using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a4_流程四_基础模块设置.air')
+        from a_a4_流程四_基础模块设置 import test1,test2,dept_query_all,grants_user,set_dept_lead1,add_StockArea,recover_dataFile
+        test1(2)  # 参数2是新增院区后缀为6位数的参数1是老模式
+        test2()  # 科室添加产品信息(产品是从外网同步过来的)
+        dept_query_all()  # 科室查询，将科室id写入文件中
+        grants_user()  # 给用户授权
+        set_dept_lead1()  # 设置一级科室负责人
+        add_StockArea()  # 添加库区
+        recover_dataFile()#恢复备份的data目录
+        commonFuc().check_text_exist_result_text('succees', 'succees')
         print('流程4执行完毕')
         # sys.exit(0)
     def flow5():
@@ -192,6 +203,7 @@ def main_text():
         try:
             flow5()
             flow6()
+            time.sleep(20)
             flow7()
             flow8()
             flow9()