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

# Conflicts:
#	data/b5_spd3_core_business_flow/message
#	data/b5_spd3_core_business_flow/message1
#	data/b5_spd3_core_business_flow/message2

air_case/b2_herp3_bs/r_g5流程设置_审批流程设置_自定义流程_保存.air/r_g5流程设置_审批流程设置_自定义流程_保存.py

@@ -70,4 +70,4 @@ def test1():
         commonFuc().check_text_exist('error', result)
 
 
-test1()
+# test1()

air_case/b2_herp3_bs/r_g6流程设置_审批流程设置_自定义流程_编辑.air/r_g6流程设置_审批流程设置_自定义流程_编辑.py

@@ -70,4 +70,4 @@ def test1():
         commonFuc().check_text_exist('error', result)
 
 
-test1()
+# test1()

air_case/b2_herp3_bs/r_g7流程设置_审批流程设置_自定义流程_删除.air/r_g7流程设置_审批流程设置_自定义流程_删除.py

@@ -77,4 +77,5 @@ except:
     print('出现异常')
 finally:
     branch_id = FileUtils().r_info(module, '院区新增')["branch_id"]
-    delData().Delete_branch_by_id(3,branch_id)
\ No newline at end of file
+    delData().Delete_branch_by_id(3,branch_id)
+    delData().Delete_probeInfo_other(3,branch_id)
\ No newline at end of file

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

@@ -43,7 +43,7 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
     # else:
     #     udi_code = 'udi_code'
     if type == 2:
-        udi_code = get_udi2(2)  # 获取条码 低值1 高值2 试剂3
+        udi_code = get_udi2(2,token)  # 获取条码 低值1 高值2 试剂3
         # import pdb
         # pdb.set_trace()
         info = (udi_code, udi_code)
@@ -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)
@@ -281,10 +281,10 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
         print('request_body', request_body)
         # # # # 发送请求
         result = commonFuc().http_post(url, request_body, headers)
-        print('result', result)
+        print('低值耗材消耗出库result', result)
     elif type == 3:
         print('检验试剂消耗出库')
-        udi_code = get_udi2(4)  # 试剂单瓶条码
+        udi_code = get_udi2(4,token)  # 试剂单瓶条码
         # 从message18文件中获取信息
         info = FileUtils().r_info8(module, "条码信息", 'message18')
         data1 = info['list_a']
@@ -370,7 +370,7 @@ def second_dept_consume_Out_Stock(type):  # 二级库消耗出库
         result = commonFuc().http_post(url, request_body, headers)
         # import pdb
         # pdb.set_trace()
-        print('result', result)
+        print('检验试剂消耗出库result', result)
 
 
 def sCan_grant(type=1):  # 获取条码and扫码发放高值不能发放
@@ -384,9 +384,9 @@ def sCan_grant(type=1):  # 获取条码and扫码发放高值不能发放
     token, projectCode, uxid, corpId, info = login(username, password, 2)
     # 登录获取用户id等信息，使用创建的用户登录============结束
     if type == 1:
-        udi_code = get_udi2(1)  # 获取条码 低值1 高值2 试剂3
+        udi_code = get_udi2(1,token)  # 获取条码 低值1 高值2 试剂3
     elif type == 3:
-        udi_code = get_udi2(3)  # 获取条码 低值1 高值2 试剂3
+        udi_code = get_udi2(3,token)  # 获取条码 低值1 高值2 试剂3
     else:
         udi_code = 'udi_code'
     if type == 1:

air_case/b5_spd3_core_business_flow/a_b9流程十六退库业务_二级库向一级库退库.air/a_b9流程十六退库业务_二级库向一级库退库.py

@@ -165,7 +165,7 @@ def second_dept_return_Out_Stock(type):  # 二级库退库出库
                                             commonFuc().get_business_data(module, "X-APP-CODE"))
 
     if type == 2:
-        udi_code = get_udi2(2)  # 获取条码 低值1 高值2 试剂3
+        udi_code = get_udi2(2,token)  # 获取条码 低值1 高值2 试剂3
 
         # 高值退库出库
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
@@ -299,7 +299,7 @@ def second_dept_return_Out_Stock(type):  # 二级库退库出库
         print('result', result)
     elif type == 1:
         print('低值耗材或者试剂退库出库')
-        udi_code = get_udi2(1)  # 获取条码 低值1 高值2 试剂3
+        udi_code = get_udi2(1,token)  # 获取条码 低值1 高值2 试剂3
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                                  "herpService_stock_pick_scan_url")
         # 从message18文件中获取信息
@@ -426,7 +426,7 @@ def second_dept_return_Out_Stock(type):  # 二级库退库出库
         print('低值产品退库出库，result', result)
     elif type == 3:
         print('试剂产品退库出库')
-        udi_code = get_udi2(3)  # 获取条码 低值1 高值2 试剂3
+        udi_code = get_udi2(3,token)  # 获取条码 低值1 高值2 试剂3
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                                  "herpService_stock_pick_scan_url")
         # 从message18文件中获取信息

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

@@ -295,6 +295,94 @@ def check_mcms_psi_dept_batch_xhck(DR_ID,type,order_no):
                                             last_modified_user
 
                                                  )
+    else:
+        mdm_goods_code=None
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_psi_dept_batch_xhck3',batch_main_key, pid, order_no,source_detail_id
+                                            ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id,
+                                            target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified,
+                                            last_modified_user
+
+                                                 )
+
+    print('expected', expected)
+    print('aaaaaaaaaaaaaaaaa')
+    actual_value1 = get_process_list2(actual)
+    expected_value1 = get_process_list2(expected)
+    actual_value2 = actual_value1.replace(" ", "")
+    expected_value2 = expected_value1.replace(" ", "")
+    # print('actual_value2',actual_value2)
+    print('expected_value2')
+    print(expected_value2)
+    print('actual_value2')
+    print(actual_value2)
+    print(compare_text_index(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')
+
+def check_mcms_psi_dept_batch_xhrk(DR_ID,source_ID,type,order_no):
+    branch_id = get_branch_id()
+    sql = " select * from  mcms_psi_dept_batch where pid='%s';" % (
+        DR_ID)
+    actual = check_mcms_dept_buy_sql(sql)
+    print('actual', actual)
+    batch_main_key = get_id("select id from mcms_psi_dept_batch where pid='%s';" % DR_ID)
+    pid = DR_ID
+    # order_no = get_id("select order_no from mcms_psi_dept_batch where pid='%s';" % DR_ID)
+    source_detail_id = source_ID+'0001'
+    pick_detail_id=None
+
+    if type==10:
+        hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
+    elif type == 20:
+        hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message1')["hosGoodsId"]
+    else:
+        hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message3')["hosGoodsId"]
+    mdm_goods_code = get_mdm_goods_code1(hos_goods_id)
+    goods_code = get_goods_code1(hos_goods_id)
+    pkg_def_id = get_pkg_def_id(hos_goods_id)
+    picker_name = FileUtils().r_info8("b2_herp3_bs", "用户名信息", 'message3')['username1']
+    picker = get_login_user_uxid_bydb(picker_name)
+    source_batch_id=get_id("select source_batch_id from mcms_psi_dept_batch where pid='%s';" % DR_ID)
+    target_batch_id=source_batch_id
+    if check_batch_id(source_batch_id)==True:
+        print('ok')
+        commonFuc().check_text_exist_result_text('succees', 'succees')
+    else:
+        commonFuc().check_text_exist_result_text('error', 'succees')
+    barcode_id=get_id("select barcode_id from mcms_psi_dept_batch where pid='%s';" % DR_ID)
+    if check_barcode_id(barcode_id)==True:
+        print('ok')
+        commonFuc().check_text_exist_result_text('succees', 'succees')
+    else:
+        commonFuc().check_text_exist_result_text('error', 'succees')
+    dept_name=FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+    shelf_code= get_stockAreaId_new_fromDb(dept_name, 2)
+    create_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
+    create_time = get_create_time("select create_time from  mcms_psi_dept_batch where pid='%s';" % DR_ID)
+    last_modified = get_create_time("select last_modified from  mcms_psi_dept_batch where pid='%s';" % DR_ID)
+    last_modified_user = None
+    if type == 16 or type==10:
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_psi_dept_batch_xhrk1', batch_main_key, pid, order_no,source_detail_id
+                                            ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id,
+                                            target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified,
+                                            last_modified_user
+
+                                                 )
+    elif type == 67:
+        mdm_goods_code=None
+        expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                 'mcms_psi_dept_batch_xhrk2', batch_main_key, pid, order_no,source_detail_id
+                                            ,pick_detail_id,hos_goods_id,mdm_goods_code,goods_code,source_batch_id,
+                                            target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified,
+                                            last_modified_user
+
+                                                 )
     else:
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
                                                  'mcms_psi_dept_batch_xhck3',batch_main_key, pid, order_no,source_detail_id
@@ -669,17 +757,18 @@ def check_mcms_psi_dept_XH_CK(type1=10,type2=16):
                                                  , create_user, create_time, last_modified, last_modified_user
 
                                                  )
-    elif type1 == 20:
+    elif type1 == 67:
         # 子表检查
-        check_mcms_psi_dept_batch(DR_ID,type1,order_no)
+        check_mcms_psi_dept_batch_xhck(DR_ID,type1,order_no)
         his_charge_no=get_id(" select his_charge_no from his_order where branch_id='%s' and psi_dept_id='%s' order by create_time desc LIMIT 1;"%(branch_id,DR_ID))
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                                 'mcms_psi_dept5', DR_ID, order_no, target_corp_id, target_branch_id,
+                                                 'mcms_psi_dept_out_xhck2',  DR_ID, order_no, target_corp_id, target_branch_id,
                                                  target_dept_id, target_dept_name, target_stock_id
                                                  , target_area_code, source_id, source_corp_id, source_branch_id,
                                                  source_dept_id, source_dept_name, source_stock_id, source_area_code,his_charge_no,accounter,account_date,
                                                  pickOrderNo, pickBillId, psiDeptOutBillId, psiDeptOutOrderNo
-                                                 , create_user, create_time, last_modified, last_modified_user)
+                                                 , create_user, create_time, last_modified, last_modified_user
+                                                 )
     else:
         # 子表检查
         check_mcms_psi_dept_batch(DR_ID,type1,order_no)
@@ -710,25 +799,20 @@ def check_mcms_psi_dept_XH_CK(type1=10,type2=16):
     else:
         print('error')
         commonFuc().check_text_exist_result_text('error', 'succees')
-    #检查拆包后生成的入库单============================================================
+    #消耗反入库============================================================
 
     branch_id = get_branch_id()
-    if type1==20:
-        sql = " select * from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_XH' order by   CREATE_TIME desc LIMIT 1;" % (
-            branch_id, type2)
-    else:
-        sql = " select * from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_CB' order by   CREATE_TIME desc LIMIT 1;" % (
-            branch_id, type2)
+
+    sql = " select * from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_XH' order by   CREATE_TIME desc LIMIT 1;" % (
+        branch_id, type2)
+
     actual = check_mcms_dept_buy_sql(sql)
     print(actual)
-    if type1==20:
-        DR_ID1 = get_id(
-            " select id from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_XH' order by   CREATE_TIME desc LIMIT 1;" % (
-                branch_id, type2))
-    else:
-        DR_ID1 = get_id(
-            " select id from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_CB' order by   CREATE_TIME desc LIMIT 1;" % (
-                branch_id, type2))
+
+    DR_ID1 = get_id(
+        " select id from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_XH' order by   CREATE_TIME desc LIMIT 1;" % (
+            branch_id, type2))
+
     sql = "select order_no from mcms_psi_dept where id='%s';" % DR_ID1
     order_no1 = get_id(sql)
     target_corp_id = get_hosid()
@@ -764,31 +848,36 @@ def check_mcms_psi_dept_XH_CK(type1=10,type2=16):
     account_date = process_tuple(get_create_time("select account_date from  mcms_psi_dept where id='%s';" % DR_ID1))
     if type2 == 10:
         # 子表检查
-        check_mcms_psi_dept_batch_in(DR_ID1, DR_ID,type2)
+        check_mcms_psi_dept_batch_xhrk(DR_ID1,source_id,type2,order_no1)
+        source_id="-"
+        source_area_code=None
+        his_charge_no=get_id(" select his_charge_no from his_order where branch_id='%s' and psi_dept_id='%s' order by create_time desc LIMIT 1;"%(branch_id,DR_ID1))
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                                 'mcms_psi_dept7', DR_ID1, order_no1, target_corp_id, target_branch_id,
+                                                 'mcms_psi_dept_out_xhrk1', DR_ID1, order_no1, target_corp_id, target_branch_id,
                                                  target_dept_id, target_dept_name, target_stock_id
-                                                 , target_area_code, source_id,source_no, source_corp_id, source_branch_id,
-                                                 source_dept_id, source_dept_name, source_stock_id, source_area_code,
-                                                 accounter, account_date,
-                                                 pickOrderNo, pickBillId, psiDeptOutBillId, psiDeptOutOrderNo
-                                                 , psiDeptInBillId,psiDeptInOrderNo,create_user, create_time, last_modified, last_modified_user,
-                                                 last_auditor,last_audit_time
+                                                 , target_area_code, source_id, source_corp_id, source_branch_id,
+                                                 source_dept_id, source_dept_name, source_stock_id, source_area_code,his_charge_no,accounter,account_date,
+                                                 create_user, create_time, last_modified, last_modified_user
+
 
 
                                                  )
-    elif type2 == 20:
-        # 子表检查
-        check_mcms_psi_dept_batch_in(DR_ID1, DR_ID, type2)
+    elif type2 == 67:
+        check_mcms_psi_dept_batch_xhrk(DR_ID1, source_id, type2, order_no1)
+        source_id = "-"
+        source_area_code = None
         his_charge_no = get_id(
-            " select his_charge_no from his_order where branch_id='%s'order by create_time desc LIMIT 1;" % branch_id)
+            " select his_charge_no from his_order where branch_id='%s' and psi_dept_id='%s' order by create_time desc LIMIT 1;" % (
+            branch_id, DR_ID1))
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                                 'mcms_psi_dept8',  DR_ID1, order_no1, target_corp_id, target_branch_id,
+                                                 'mcms_psi_dept_out_xhrk2', DR_ID1, order_no1, target_corp_id,
+                                                 target_branch_id,
                                                  target_dept_id, target_dept_name, target_stock_id
-                                                 , target_area_code, source_corp_id, source_branch_id,
-                                                 source_dept_id, source_dept_name, source_stock_id,
-                                                 his_charge_no,accounter, account_date,
+                                                 , target_area_code, source_id, source_corp_id, source_branch_id,
+                                                 source_dept_id, source_dept_name, source_stock_id, source_area_code,
+                                                 his_charge_no, accounter, account_date,
                                                  create_user, create_time, last_modified, last_modified_user
+
                                                  )
     else:
         # 子表检查
@@ -829,20 +918,20 @@ 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))  # 设置登录账号默认权限是二级库
-    # sCan_grant(1)  # 低值扫码发放
-    # check_mcms_psi_dept_out_and_in(16,10)
-    # sCan_grant(3)  # 试剂扫码发放
-    # check_mcms_psi_dept_out_and_in(66,67)
-    # 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)  # 低值消耗出库
-
+    updateUserLoginDefaultRange(get_listUserMgrRangePage1(2))  # 设置登录账号默认权限是二级库
+    sCan_grant(1)  # 低值扫码发放
+    check_mcms_psi_dept_out_and_in(16,10)#检查出库单和入库单（包括主表和子表）
+    sCan_grant(3)  # 试剂扫码发放
+    check_mcms_psi_dept_out_and_in(66,67)#检查出库单和入库单（包括主表和子表）
+    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_in_Stock(1)  # 低值消耗退回入库
-    check_mcms_psi_dept_XH_CK(10,16)
+    check_mcms_psi_dept_XH_CK(10,10)#检查低值消耗出库单和消耗入库单包括主表和子表
     second_dept_consume_Out_Stock(3)  # 试剂消耗出库
     second_dept_consume_in_Stock(3)  # 试剂消耗退回入库
+    check_mcms_psi_dept_XH_CK(67, 67)#检查试剂消耗出库单和消耗入库单包括主表和子表
     commonFuc().check_text_exist_result_text('SUCCESS', 'SUCCESS')
 except Exception as e:
     # 打印错误信息

air_case/b6_spd3_core_business_flow_database_check/a_b9流程十六退库业务_二级库向一级库退库_数据库验证.air/a_b9流程十六退库业务_二级库向一级库退库_数据库验证.py

@@ -165,7 +165,7 @@ def second_dept_return_Out_Stock(type):  # 二级库退库出库
                                             commonFuc().get_business_data(module, "X-APP-CODE"))
 
     if type == 2:
-        udi_code = get_udi2(2)  # 获取条码 低值1 高值2 试剂3
+        udi_code = get_udi2(2,token)  # 获取条码 低值1 高值2 试剂3
 
         # 高值退库出库
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
@@ -299,7 +299,7 @@ def second_dept_return_Out_Stock(type):  # 二级库退库出库
         print('result', result)
     elif type == 1:
         print('低值耗材或者试剂退库出库')
-        udi_code = get_udi2(1)  # 获取条码 低值1 高值2 试剂3
+        udi_code = get_udi2(1,token)  # 获取条码 低值1 高值2 试剂3
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                                  "herpService_stock_pick_scan_url")
         # 从message18文件中获取信息
@@ -426,7 +426,7 @@ def second_dept_return_Out_Stock(type):  # 二级库退库出库
         print('低值产品退库出库，result', result)
     elif type == 3:
         print('试剂产品退库出库')
-        udi_code = get_udi2(3)  # 获取条码 低值1 高值2 试剂3
+        udi_code = get_udi2(3,token)  # 获取条码 低值1 高值2 试剂3
         url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
                                                                                  "herpService_stock_pick_scan_url")
         # 从message18文件中获取信息

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)
@@ -890,28 +890,29 @@ def get_udi3(type=1):  # 三级科室库存明细查询获取条码
     # # 请求体
     request_body = 'request_body'
     deptName3 = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid3"]
-    stockId3 = get_stockId(deptName3 + '库房', 3)
+    stockId3 = get_stockId_fromdb(deptName3 + '库房')
     deptid3 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3']
+    areaCode = get_stockAreaId_new_fromDb(deptName3, 2)
     if type == 1:
         hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId']
         GoodsId = hosGoodsId.replace(get_hosid(), '')
-        request_body = commonFuc().get_business_data(module, "payload17_2", GoodsId, get_branch_id(), deptid3, stockId3)
+        request_body = commonFuc().get_business_data(module, "payload17_2", areaCode,GoodsId, get_branch_id(), deptid3, stockId3)
     elif type == 2:
         hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message1')['hosGoodsId']
         GoodsId = hosGoodsId.replace(get_hosid(), '')
-        request_body = commonFuc().get_business_data(module, "payload17_2_1", GoodsId, get_branch_id(), deptid3,
+        request_body = commonFuc().get_business_data(module, "payload17_2_1",areaCode, GoodsId, get_branch_id(), deptid3,
                                                      stockId3)
 
     elif type == 3:
         hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']
         GoodsId = hosGoodsId.replace(get_hosid(), '')
-        request_body = commonFuc().get_business_data(module, "payload17_2_2", GoodsId, get_branch_id(), deptid3,
+        request_body = commonFuc().get_business_data(module, "payload17_2_2", areaCode,GoodsId, get_branch_id(), deptid3,
                                                      stockId3)
 
     elif type == 4:  # 试剂单瓶条码
         hosGoodsId = FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message3')['hosGoodsId']
         GoodsId = hosGoodsId.replace(get_hosid(), '')
-        request_body = commonFuc().get_business_data(module, "payload17_3", GoodsId, get_branch_id(), deptid3, stockId3)
+        request_body = commonFuc().get_business_data(module, "payload17_3",areaCode, GoodsId, get_branch_id(), deptid3, stockId3)
     print('getudi_request_body', request_body)
 
     # # # # 发送请求
@@ -975,7 +976,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 +1013,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)
     # 获取请求头信息
@@ -1050,11 +1051,7 @@ def get_udi(type=1):  # 退货出库扫条码
             break
         elif lockStatus == 1:
             continue
-    # pkgcode = data1[0]['pkgCodeSee']
-    # pkgcode1 = pkgcode[0:20]
-    # pkgcode2 = pkgcode[21:len(pkgcode)]
-    # print(pkgcode1, pkgcode2)
-    # 013530000003170010333\x1D112404261724110221UT240426000001802
+
     print('pkgCodeSee', pkgCodeSee)
 
     # 退货出库扫条码
@@ -2995,9 +2992,9 @@ def pickScan4(udi_code):  # 二级库扫码 只扫码不发放
 
     deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"]
     deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"]
-    stockId = get_stockId(deptName + '库房', 2)
     deptName2 = deptName + '库房'
-    areaCode = get_stockAreaId_new(deptid2, deptName, 2)
+    stockId = get_stockId_fromdb(deptName2)
+    areaCode = get_stockAreaId_new_fromDb(deptName, 2)
     request_body = commonFuc().get_business_data(module, "payload60", udi_code, stockId, deptName2, areaCode)
     print('获取条码信息request_body', request_body)
     result = commonFuc().http_post(url, request_body, headers)
@@ -3025,9 +3022,9 @@ def pickScan3(udi_code, type=1):  # 二级库扫码发放(高值产品不能扫
 
     deptid2 = FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"]
     deptName = FileUtils().r_info8('b2_herp3_bs', '所有科室name', 'message6')["deptid2"]
-    stockId = get_stockId(deptName + '库房', 2)
-    deptName2 = deptName + '库房'
-    areaCode = get_stockAreaId_new(deptid2, deptName, 2)
+    stockId = get_stockId_fromdb(deptName + '库房')
+    deptName2 = deptName+'库房'
+    areaCode =get_stockAreaId_new_fromDb(deptName, 2)
     request_body = commonFuc().get_business_data(module, "payload60", udi_code, stockId, deptName2, areaCode)
     print('获取条码信息request_body', request_body)
     result = commonFuc().http_post(url, request_body, headers)
@@ -3147,7 +3144,7 @@ def pickScan3(udi_code, type=1):  # 二级库扫码发放(高值产品不能扫
 
     # # # # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
-    print('result', result)
+    print('二级库扫码发放提交result', result)
     return data1
 
 

common/db/sql/sql_del_branch_info.py

@@ -150,15 +150,17 @@ class delData(object):
         # print('多余库房信息删除成功 ')
         cursor.close()
 
-    def Delete_probeInfo_other(self,type=1):
+    def Delete_probeInfo_other(self,type=1,branch_id='branch_id'):
         connection = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd3_herp_test2",
                                      charset="utf8")
         cursor = connection.cursor()
         # 删除多余库房信息
         if type==1:
             sql = "delete  from mcms_stock_info where stock_name like '%东土城路院区_____中心库房';"
-        else:
+        elif type==2:
             sql = "delete  from mcms_stock_info where stock_name like '%东土城路院区______中心库房';"
+        else:
+            sql = "delete  from mcms_stock_info where branch_id = '%s';" % branch_id
         print(sql)
         cursor.execute(sql)
         cursor.execute("commit;")

data/b5_spd3_core_business_flow/message13

@@ -8,29 +8,29 @@
       taskType: 1
       sourceOrgId: p1e37e
       sourceOrgName: 国药集团公司sya!$
-      sourceOrderNo: PSh0347202408050033
+      sourceOrderNo: PSh0347202408060022
       billMode: '66'
       stockKind:
       purMode:
-      sourceId: PSh0347202408050033
+      sourceId: PSh0347202408060022
       sourceDetailId:
       sourceType: PSD
       sourceTypeName: 配送单
       sourceVersion: 1
-      planOrderNo: PLAN2024080534400
-      purOrderNo: CG2024080522576
+      planOrderNo: PLAN2024080634538
+      purOrderNo: CG2024080622673
       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'
+      billRelationJson: '{"planBillId":"Ph034720240806031183","planOrderNo":"PLAN2024080634538","purOrderNo":"CG2024080622673","purBillId":"Ch034720240806000045","purBillDate":"2024-08-06
+        13:27:19","distrBillId":"PSh0347202408060022","distrOrderNo":"PSh0347202408060022"}'
+      taskDate: '2024-08-06 13:30:29'
       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: CHECKh03472024080600020
+  CHECK_NO2: CHECKh03472024080600020

data/b5_spd3_core_business_flow/message18

 条码信息:
   list_a:
-  - &id001
-    id: '100000142024071200000006'
-    snCode: '100000142024071200000006'
-    ssccCode: '010839000189392425'
-    pkgCodeSee: '0101123456789012103331124071217250118241100000142024071200000006'
-    hosGoodsId: h034700004547
-    hosGoodsCode: '00004547'
-    goodsCode: '00004547'
-    goodsName: 一次性注射器_低值gV9^n
-    goodsSpec: G-31891
-    goodsMfrsName: 德国歌德公司 Geuder AG
-    unit: 支
-    purMode: 10
-    batchCode: '333'
-    productDate: '2024-07-12'
-    expdtDate: '2025-01-18'
-    pkgDefName: '100'
-    pkgDefQty: 100.0
-    stockId: 49c401cc82704c7f8c9d110ff39e9106
-    stockName: 东土城路院区&BvGU中心库房
-    areaName: 自动化测试
-    areaCode: areah03472727
-    lockStatus: 0
-    unitName: 100支/100
-    shelfCode: areah03472727-2-01-01
-    shelfNo: 自动化测试-2-01-01
-    pkgDefId: 78dc0eecc5f64150b0d98f3a2c367734
-    extInfo: '{"pkgDefId": "78dc0eecc5f64150b0d98f3a2c367734", "pkgDefQty": 100, "purBillId":
-      "CG2024071221144", "pkgDefName": "100", "distrBillId": "PSh0347202407120002",
-      "inStockTime": "2024-07-12 08:07:55", "distrDetailId": "03839609", "certificateCode":
-      ""}'
-    bottleId:
-    pkgType: '16'
-    miDjmc: ''
-    miCode: ''
-    transferRatio: 1.0
-    qty: 1
-    shelfKind: 0
-    shelfKindName: 普通货位
-    provName: 国药集团公司BCJj3
-    provId: p1e34a
-    inStockDate:
-    mfrCode:
-    made: 德国
-    price:
-    barName: 100支/100
-    purModeText: 低值耗材
-    codeType: 16
+  - 
   list_b:
-  - *id001
+  - 
   list_c:
-  - *id001
+  - 

data/b6_spd3_core_business_flow_database_check/data

@@ -171,7 +171,16 @@
 #消耗出库子表
 "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_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}'
+"mcms_psi_dept_out_xhck2": '{"id":"%s","order_no":"%s","bill_mode":"67","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":21,"patient_id":"","patient_name":"","machine_id":"","machine_name":"","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}'
+
+"mcms_psi_dept_out_xhrk1": '{"id":"%s","order_no":"%s","bill_mode":"10","rec_type":"YND","psi_flag":1,"psi_kind":"108","stock_kind":"RK_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":null,"consume_type":1,"patient_id":null,"patient_name":null,"machine_id":null,"machine_name":null,"his_charge_no":"%s","remark":null,"tb_status":30,"accounter":"%s","account_date":"%s","bill_relation_json":null,"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}'
+"mcms_psi_dept_out_xhrk2": '{"id":"%s","order_no":"%s","bill_mode":"67","rec_type":"YND","psi_flag":1,"psi_kind":"108","stock_kind":"RK_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":null,"consume_type":1,"patient_id":null,"patient_name":null,"machine_id":null,"machine_name":null,"his_charge_no":"%s","remark":null,"tb_status":30,"accounter":"%s","account_date":"%s","bill_relation_json":null,"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}'
+
+
+#消耗入库子表
+"mcms_psi_dept_batch_xhrk1": '{"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_xhrk2": '{"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}'