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

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

@@ -265,6 +265,7 @@ def edit_goods_target(currentDeptId, targetDeptId):
         print('编辑产品请领渠道result', result)
 
 
+
 def pick_execute():
     module = "b5_spd3_core_business_flow"
     # # 登录获取用户id等信息，使用创建的用户登录===========开始
@@ -283,7 +284,7 @@ def pick_execute():
                                                                               "herpService_stock_out_buyPage_url")
     info=  FileUtils().r_info8('b5_spd3_core_business_flow', "三级库向二级库请领单号", 'message27')
 
-    DRNo_list = []
+    # DRNo_list = []
     for i in range(1, 4):
         if i == 1:
             orderNo = info['buy_NO1']
@@ -333,7 +334,7 @@ def pick_execute():
             print('udi_code', udi_code)
             if udi_code=='pkgCodeSee':
                 print('没有获取到条码')
-                return
+                sys.exit(0)
             if billMode == '16':
                 targetAreaCode, sourceId = pickScan2(BH_ID, udi_code, 1,token)  # 低值
             elif billMode == '20':
@@ -349,20 +350,33 @@ def pick_execute():
             print('提交拣货执行单=================', url)
             if billMode == '16':
                 request_body = commonFuc().get_business_data(module, "payload51_1_1", targetAreaCode, sourceId)
+                print('提交拣货执行单', 'request_body', request_body)
+                result = commonFuc().http_post(url, request_body, headers)
+                print('提交拣货执行单,result1', result)
+                DR_id = commonFuc().analysis_json('data', result)
+                # 将拣货单id写入文件
+                info1 = (DR_id, DR_id)
+                titlename = ('DR_NO1低值', 'DR_NO1低值')
+                FileUtils().w_info8(info1, 'b5_spd3_core_business_flow', '拣货单低值id', titlename, 'message28')
             elif billMode == '20':
                 request_body = commonFuc().get_business_data(module, "payload51_1_2", targetAreaCode, sourceId)
+                print('提交拣货执行单', 'request_body', request_body)
+                result = commonFuc().http_post(url, request_body, headers)
+                print('提交拣货执行单,result1', result)
+                DR_id = commonFuc().analysis_json('data', result)
+                info1 = (DR_id, DR_id)
+                titlename = ('DR_NO1高值', 'DR_NO1高值')
+                FileUtils().w_info8(info1, 'b5_spd3_core_business_flow', '拣货单高值id', titlename, 'message28')
             elif billMode == '66':
                 request_body = commonFuc().get_business_data(module, "payload51_1_3", targetAreaCode, sourceId)
+                print('提交拣货执行单', 'request_body', request_body)
+                result = commonFuc().http_post(url, request_body, headers)
+                print('提交拣货执行单,result1', result)
+                DR_id = commonFuc().analysis_json('data', result)
+                info1 = (DR_id, DR_id)
+                titlename = ('DR_NO1试剂', 'DR_NO1试剂')
+                FileUtils().w_info8(info1, 'b5_spd3_core_business_flow', '拣货单试剂id', titlename, 'message28')
 
-            print('提交拣货执行单', 'request_body', request_body)
-            result = commonFuc().http_post(url, request_body, headers)
-            print('提交拣货执行单,result1', result)
-            DR_id = commonFuc().analysis_json('data', result)
-            DRNo_list.append(DR_id)
-            # 将拣货单id写入文件
-    info = (DRNo_list[0], DRNo_list[1], DRNo_list[2])
-    titlename = ('DR_NO1', 'DR_NO2', 'DR_NO3')
-    FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '拣货单id', titlename, 'message28')
 
 def main():
     try:

air_case/b6_spd3_core_business_flow_database_check/a_b6流程十三请领业务流_三级库向二级库_数据库验证.air/a_b6流程十三请领业务流_三级库向二级库_数据库验证.py

@@ -536,15 +536,18 @@ def check_mcms_psi_dept(type=16):
     branch_id, type)
     actual = check_mcms_dept_buy_sql(sql)
     print(actual)
-    info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单id", 'message28')
+    # info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单id", 'message28')
     # print(info)
 
     if type == 16:
-        DR_ID = info['DR_NO2']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单低值id", 'message28')
+        DR_ID = info['DR_NO1低值']
     elif type == 20:
-        DR_ID = info['DR_NO3']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单高值id", 'message28')
+        DR_ID = info['DR_NO1高值']
     else:
-        DR_ID = info['DR_NO1']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单试剂id", 'message28')
+        DR_ID = info['DR_NO1试剂']
     DR_ID = ''.join(DR_ID)
     sql = "select order_no from mcms_psi_dept where id='%s';" % DR_ID
     order_no = get_id(sql)
@@ -632,13 +635,16 @@ def check_mcms_psi_dept_in(type=16):
     branch_id, type)
     actual = check_mcms_dept_buy_sql(sql)
     print(actual)
-    info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单id", 'message28')
+
     if type == 16:
-        source_id = info['DR_NO2']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单低值id", 'message28')
+        source_id = info['DR_NO1低值']
     elif type == 20:
-        source_id = info['DR_NO3']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单高值id", 'message28')
+        source_id = info['DR_NO1高值']
     else:
-        source_id = info['DR_NO1']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单试剂id", 'message28')
+        source_id = info['DR_NO1试剂']
     source_id = ''.join(source_id)
     source_no=get_id("select order_no from  mcms_psi_dept where id='%s';"%source_id)
     #获取入库单主键DR_ID
@@ -867,11 +873,13 @@ def main():
     # 低值拣货执行
     pick_execute()
 
+    time.sleep(6)
     # 检查拣货单
     list_data = ['16', '20', '66']
     for i in list_data:
         check_mcms_pick(int(i))
 
+    time.sleep(6)
     # 检查出库单
     check_mcms_psi_dept(16)
     check_mcms_psi_dept(20)

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

@@ -569,5 +569,7 @@ try:
     putaway()#中心库上架
     # ===============上面调通了================================
     commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
-    commonFuc().check_text_exist_result_text('error', '1')
+except Exception as e:
+    # 打印错误信息
+    print(f"发生错误: {e}")
+    commonFuc().check_text_exist_result_text('error', 'SUCCESS')
\ No newline at end of file

air_case/b6_spd3_core_business_flow_database_check/a_c0流程十七退货业务 中心库退供应商_数据库验证.air/a_c0流程十七退货业务 中心库退供应商_数据库验证.py

@@ -633,5 +633,7 @@ try:
     second_center_Stock_return_Out(1) #低值耗材退货出库
     second_center_Stock_return_Out(3) #试剂耗材退货出库
     commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
-    commonFuc().check_text_exist_result_text('error', '1')
+except Exception as e:
+    # 打印错误信息
+    print(f"发生错误: {e}")
+    commonFuc().check_text_exist_result_text('error', 'SUCCESS')
\ No newline at end of file

air_case/b6_spd3_core_business_flow_database_check/a_c1流程十八中心库业务_拆包功能_数据库验证.air/a_c1流程十八中心库业务_拆包功能_数据库验证.py

@@ -369,5 +369,7 @@ try:
     center_Stock_unpack(1)  # 低值耗材扫码发放
     center_Stock_unpack(3)  # 试剂耗材扫码发放
     commonFuc().check_text_exist_result_text('succees', 'succees')
-except:
-    commonFuc().check_text_exist_result_text('error', '1')
+except Exception as e:
+    # 打印错误信息
+    print(f"发生错误: {e}")
+    commonFuc().check_text_exist_result_text('error', 'SUCCESS')

data/a2_mdm3_ea/data

@@ -6,7 +6,7 @@
 "upCompanyList_url": "/api/mdmService/mdmCompany/upCompanyList"
 "auditCompanyRegistBill_url": "/api/mdmService/companyRegistBill/auditCompanyRegistBill"
 "updateByIdCompanyRegistBill_url": "/api/mdmService/companyRegistBill/updateById/"
-"username": "test001"
+"username": "test_1"
 "password": "1qaz!QAZ"
 
 json_contentType: "application/json"

data/a4_mdm3_cm/data

-"username": "test001"
+"username": "test_1"
 "password": "a123456!"
 "password1": "1qaz!QAZ"
 

data/a5_mdm3_pdm/data

@@ -9,7 +9,7 @@
 "hdiFusion_getGoodsinfoAndDiLst_url": "/api/hdiFusion/supplyProvHosGoods/getGoodsinfoAndDiLst"
 "hdiFusion_supplyProvHosGoods_add_url": "/api/hdiFusion/supplyProvHosGoods/add"
 
-"username": "test001"
+"username": "test_1"
 "password": "a123456!"
 "password1": "1qaz!QAZ"
 json_contentType: "application/json"

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024080600063
-  CHECK_NO2: CHECKh03472024080600063
+  CHECK_NO1: CHECKh03472024080600071
+  CHECK_NO2: CHECKh03472024080600071

data/b5_spd3_core_business_flow/message18

 条码信息:
   list_a:
   - &id001
-    id: '100000142024080600000644'
-    snCode: '100000142024080600000644'
-    ssccCode: '010839000192073021'
-    pkgCodeSee: '0101123456789012112408061725021210222241100000142024080600000644'
-    hosGoodsId: h034700004777
-    hosGoodsCode: '00004777'
-    goodsCode: '00004777'
-    goodsName: 高值牙钻机KqoFI
+    id: '100000142024080600000751'
+    snCode: '100000142024080600000751'
+    ssccCode: '010839000192083723'
+    pkgCodeSee: '01376100000477901124080617250212104444241100000142024080600000751'
+    hosGoodsId: h034700004779
+    hosGoodsCode: '00004779'
+    goodsCode: '00004779'
+    goodsName: 新型冠状病毒检测试剂nDxo8
     goodsSpec: G-31891
     goodsMfrsName: 德国歌德公司 Geuder AG
     unit: 支
-    purMode: 20
-    batchCode: '222'
+    purMode: 60
+    batchCode: '4444'
     productDate: '2024-08-06'
     expdtDate: '2025-02-12'
-    pkgDefName:
-    pkgDefQty: 1.0
-    stockId: 620d61c8ac054331b669e7a979d93dba
-    stockName: 二级检验科002库房
+    pkgDefName: '100'
+    pkgDefQty: 100.0
+    stockId: 1a570b65b3724d4c98db2a8a4163cd1c
+    stockName: 三级检测组003库房
     areaName: 默认库区
-    areaCode: areah03472820
+    areaCode: areah03472821
     lockStatus: 0
-    unitName: 1支
-    shelfCode: areah03472820-A-01-01
+    unitName: 100支/100
+    shelfCode: areah03472821-A-01-01
     shelfNo: A01-A-01-01
-    pkgDefId:
-    extInfo: '{"pkgDefQty": 1, "purBillId": "CG2024080622676", "distrBillId": "PSh0347202408060024",
-      "inStockTime": "2024-08-06 16:07:37", "useFrequency": 1, "distrDetailId": "03840787",
-      "certificateCode": "", "multiChargeFlag": 0}'
+    pkgDefId: 75012af7fbea44af9dd050857dac199f
+    extInfo: '{"pkgDefId": "75012af7fbea44af9dd050857dac199f", "pkgDefQty": 100, "purBillId":
+      "CG2024080622677", "pkgDefName": "100", "distrBillId": "PSh0347202408060025",
+      "inStockTime": "2024-08-07 14:22:47", "distrDetailId": "03840788", "certificateCode":
+      ""}'
     bottleId:
-    pkgType: '20'
+    pkgType: '66'
     miDjmc: ''
     miCode: ''
     transferRatio: 1.0
@@ -40,13 +41,13 @@
     shelfKindName: 普通货位
     provName: 国药集团公司uAfpK
     provId: p1e386
-    inStockDate: '2024-08-06 16:07:37'
+    inStockDate: '2024-08-07 14:22:47'
     mfrCode:
     made: 德国
     price:
-    barName: 1支
-    purModeText: 高值耗材
-    codeType: 20
+    barName: 100支/100
+    purModeText: 检验试剂
+    codeType: 66
   list_b:
   - *id001
   list_c:

data/b5_spd3_core_business_flow/message21

@@ -16,7 +16,7 @@
       pkgDefName: '100'
       pkgDefQty: 100.0
       pkgQty:
-      qty: 1100.0
+      qty: 1300.0
       goodsImg: []
       pkgDefId: 75012af7fbea44af9dd050857dac199f
       buyPkgQty:
@@ -34,7 +34,7 @@
       targetStockName: 东土城路院区l7B8J中心库房
       purchaseFlag: 1
       tempFlag: 0
-      grantWay: 3
+      grantWay: 1
       deptGoodsStatus:
       codingType: 0
       purModeText: 检验试剂

data/b6_spd3_core_business_flow_database_check/data

@@ -171,7 +171,21 @@
 #消耗出库子表
 "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}'
+
+#三级科室退库出库主表
+"mcms_psi_dept_tkck1": '{"id":"%s","order_no":"%s","bill_mode":"16","rec_type":"YND","psi_flag":-1,"psi_kind":"208","stock_kind":"CK_LYTK","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":null,"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":0,"patient_id":null,"patient_name":null,"machine_id":null,"machine_name":null,"his_charge_no":null,"remark":"","tb_status":20,"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":0,"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":0}'
+"mcms_psi_dept_tkck2": '{"id":"%s","order_no":"%s","bill_mode":"20","rec_type":"YND","psi_flag":-1,"psi_kind":"208","stock_kind":"CK_LYTK","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":null,"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":0,"patient_id":null,"patient_name":null,"machine_id":null,"machine_name":null,"his_charge_no":null,"remark":"","tb_status":20,"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":0,"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":0}'
+"mcms_psi_dept_tkck3": '{"id":"%s","order_no":"%s","bill_mode":"66","rec_type":"YND","psi_flag":-1,"psi_kind":"208","stock_kind":"CK_LYTK","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":null,"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":0,"patient_id":null,"patient_name":null,"machine_id":null,"machine_name":null,"his_charge_no":null,"remark":"","tb_status":20,"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":0,"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":0}'

main1/main_text.py

@@ -84,19 +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()
-        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')
+        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():
@@ -272,7 +272,7 @@ def main_text():
     Button(root, text='流程一\n外网企业注册审批', width=16, height=8,command=flow1).grid(row=2,column=0)
     Button(root, text='流程二\n供货关系申请审批', anchor='center', width=16, height=8,command=flow2).grid(row=2,column=2)
     Button(root, text='流程三\n流程三_产品导\n入和审批', anchor='center', width=16, height=8,command=flow3).grid(row=2,column=4)
-    Button(root, text='流程\n内网基础模块设置', anchor='center', width=16, height=8,command=flow4).grid(row=2,column=6)
+    Button(root, text='流程四\n内网基础模块设置', anchor='center', width=16, height=8,command=flow4).grid(row=2,column=6)
     Button(root, text='流程五\n中心库入库正结算\n开票', anchor='center', width=16, height=8,command=flow5).grid(row=2,column=8)
     Button(root, text='流程六\n中心库入库负结算', anchor='center', width=16, height=8,command=flow6).grid(row=2,column=10)
     Button(root, text='流程七\n中心库入库正负结算', anchor='center', width=16, height=8,command=flow7).grid(row=3,column=0)