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

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

@@ -426,21 +426,42 @@ 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, 'message26')
             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, 'message26')
             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)
-
-            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, 'message26')
+                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, 'message26')
+            # 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, 'message26')
 
 
 # 复核===================================

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

@@ -386,15 +386,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", 'message26')
+    # info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单id", 'message26')
     # print(info)
 
     if type == 16:
-        DR_ID = info['DR_NO2']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单低值id", 'message26')
+        DR_ID = info['DR_NO1低值']
     elif type == 20:
-        DR_ID = info['DR_NO3']
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "拣货单高值id", 'message26')
+        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)
@@ -846,8 +849,9 @@ def main():
     from a_b5流程十二请领业务流_二级库向二级库 import BuyCarSubmit, pick_execute
 
     # ========下面暂时注释
-    add_dept2()  # 新增一个二级科室
-    add_new_deptinfo()  # 写入科室信息到文件中
+    token, projectCode1, uxid1, corpId1, info1 = call_login(2)
+    add_dept2(token)  # 新增一个二级科室
+    add_new_deptinfo(token)  # 写入科室信息到文件中
     grants_user_new()  # 新增授权
     # 同步库房信息
     execute_command("python runner_test.py tag id2263-221 debug sit")

data/b6_spd3_core_business_flow_database_check/data

@@ -75,9 +75,9 @@
 "check_mcms_dept_buy_car3": '{"id": "%s", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "area_code": "%s", "area_name": "%s", "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "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"), "tb_status": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "coding_type": 0}'
 
 #科室请领单
-"mcms_dept_buy5": '{"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": null, "create_type": "SG", "buy_kind": "LY", "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": "xhs0301", "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_buy5_2": '{"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": null, "create_type": "SG", "buy_kind": "LY", "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": "xhs0301", "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_buy5_3": '{"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": null, "create_type": "SG", "buy_kind": "LY", "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": "xhs0301", "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_buy5": '{"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": null, "create_type": "SG", "buy_kind": "LY", "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": "null", "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_buy5_2": '{"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": null, "create_type": "SG", "buy_kind": "LY", "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": "null", "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_buy5_3": '{"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": null, "create_type": "SG", "buy_kind": "LY", "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": "null", "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_pick1": '{"id": "%s", "hos_id": "%s", "branch_id": "%s", "order_no": "%s", "source_id": "%s", "bill_mode": "16", "create_type": "ZD", "pick_type": "KS_SL", "dept_id": "%s", "dept_name": "%s", "stock_id": "%s", "area_code": "%s", "area_name": "默认库区", "area_mgr_id": None, "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "默认库区", "receiver": None, "reason_kind": None, "barcode_flag": 1, "pkg_flag": 1, "patient_id": None, "patient_name": None, "remark": "", "tb_status": 40, "reviewer": "%s", "review_date": %s, "bill_relation_json": "{"buyBillId":"%s","pickOrderNo":"%s","buyOrderNo":"%s","pickBillId":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 4, "last_auditor": None, "last_audit_time": None, "picker": "%s", "picker_name": "%s"}'