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

air_case/b5_spd3_core_business_flow/a_b0流程七_中心库入库结算_正负结算.air/a_b0流程七_中心库入库结算_正负结算.py

@@ -220,6 +220,7 @@ def center_warehouse_return():
 
 def main():
     try:
+        updateUserLoginDefaultRange(get_listUserMgrRangePage(1))  # 设置登录账号默认权限是1级库
         # test1() # 提交采购计划   # 外网配送   # 内网验收入库结算
         # 先查询所有的部门信息写入文件
         dept_query_all()

air_case/public1/public1/public1.py

@@ -145,8 +145,10 @@ def approval_center(OBH_ID='OBhxxxxxxxxxxxxxxx'):
     code = commonFuc().analysis_json('code', result)
     data = commonFuc().analysis_json('data', result)
     total = commonFuc().analysis_json('total', result)
-    if code >= 0:
+    if code == 0:
         commonFuc().check_text_exist(0, result)
+    elif code == '14070024':
+        commonFuc().check_text_exist('error', result)
     else:
         commonFuc().check_text_exist('error', result)
 def approval_allProcessPage(OBH_ID='OBhxxxxxxxxxxxxxxx'):
@@ -274,7 +276,7 @@ def approval_center_all(OBH_ID='OBhxxxxxxxxxxxxxxx'):
             code = commonFuc().analysis_json('code', result)
             data = commonFuc().analysis_json('data', result)
             total = commonFuc().analysis_json('total', result)
-            if code >= 0:
+            if code == 0:
                 commonFuc().check_text_exist(0, result)
             elif code=='14070024':
                 commonFuc().check_text_exist('error', result)
@@ -379,13 +381,20 @@ def settle():  # 结算相关
     branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"]
     hosId = branch_id[0:5]
     provId = FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_corpId"]
-    accountDate1 = timeUtils().get_time_hms(5)
+    # accountDate1 = timeUtils().get_time_hms(5)
+    accountDate1 = timeUtils().get_time_add(-30,2)
     accountDate2 = timeUtils().get_time_hms(5)
-    request_body = commonFuc().get_business_data(module, "payload7", provId, accountDate1, accountDate2, hosId, hosId)
+    hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
+    request_body = commonFuc().get_business_data(module, "payload7", hos_goods_id,provId, accountDate1, accountDate2, hosId, hosId)
+    print('生成结算单列表查询request_body',request_body)
     result = commonFuc().http_post(url, request_body, headers)
-    print('result', result)
+    print('生成结算单列表查询result', result)
     data = commonFuc().analysis_json('data', result)
     data1 = commonFuc().analysis_json('data', data)
+    total=commonFuc().analysis_json('total', data)
+    if total<2:
+        print('待结算数据小于两条，检查待结算数据，暂时返回')
+        return
     # 取结算单id
     list_a = []
     for i in data1:

common/db/sql/sql_tools.py

@@ -194,7 +194,19 @@ def get_account_date(sql):
     db.close()
     return new_str1
 
-
+def get_account_date1(sql):
+    db, cursor = get_sql_conn()
+    cursor.execute(sql)
+    results = cursor.fetchone()
+    str1 = str(results)
+    new_str1 = str1.replace(',)', '')
+    new_str1 = new_str1.replace('(d', 'd')
+    # new_str1 = new_str1.replace(',', '')
+    # new_str1 = new_str1.replace("'", '')
+    # print(new_str1)
+    cursor.close()
+    db.close()
+    return new_str1
 def set_goods_coding_type(branch_id):  # 设置科室产品为赋码管理0为赋码管理1是非赋码
     db, cursor = get_sql_conn()
     sql = "UPDATE mcms_dept_goods_info SET coding_type = 0 WHERE branch_id=%s;"
@@ -418,7 +430,17 @@ def check_batch_id(source_batch_id):
     else:
         return False
 
-
+def check_distr_detail_id(source_distr_detail_id):
+    db, cursor = get_sql_conn()
+    cursor.execute("select id from hdi_distr_detail where id='%s'" % (source_distr_detail_id))
+    results1 = cursor.fetchall()
+    cursor.close()
+    db.close()
+    batch_id = process_tuple(results1)
+    if batch_id != None:
+        return True
+    else:
+        return False
 def check_barcode_id(barcode_id):
     db, cursor = get_sql_conn()
     cursor.execute("select id from hdi_barcode where id='%s'" % (barcode_id))
@@ -430,7 +452,17 @@ def check_barcode_id(barcode_id):
         return True
     else:
         return False
-
+def check_un_balance_id(un_balance_id):
+    db, cursor = get_sql_conn()
+    cursor.execute("select id from mcms_out_un_balance where id='%s'" % (un_balance_id))
+    results1 = cursor.fetchall()
+    cursor.close()
+    db.close()
+    batch_id = process_tuple(results1)
+    if batch_id != None:
+        return True
+    else:
+        return False
 
 def get_PICK_id(branch_id, bill_mode):
     sql = "select id from  mcms_pick  where branch_id='%s' and bill_mode='%s' order by   CREATE_TIME desc LIMIT 1;" % (

data/b5_spd3_core_business_flow/data

@@ -96,7 +96,7 @@ json_headers2: {
 "payload5": {"batchList":[{"viewId":"%s","shelfCode":"%s"}],"sourceId":"%s","sourceType":"%s","sourceVersion":"%s","targetDeptId":"%s","targetDeptName":"%s","targetAreaCode":"%s","targetAreaName":"%s","pkgTaskId":null}
 
 "payload6": {"pageNum":1,"pageSize":50,"orderBy":"","queryObject":{"branchId":"%s","taskType":0,"stockKind":"","sourceOrgName":"","hosId":"%s"}}
-"payload7": {"pageNum":1,"pageSize":50,"queryObject":{"goodsInfo":"","provId":"%s",barCodeInfo":"","fromOrderNo":"","purModeList":["10"],"accountDate1":"%s","accountDate2":"%s","tbStatus":0,"hosId":"%s"},"hosId":"%s"}
+"payload7": {"pageNum":1,"pageSize":50,"queryObject":{"goodsInfo":"%s","provId":"%s",barCodeInfo":"","fromOrderNo":"","purModeList":["10"],"accountDate1":"%s","accountDate2":"%s","tbStatus":0,"hosId":"%s"},"hosId":"%s"}
 
 "payload8": {"genTypeEnum":"0","queryInfo":{"pageNum":1,"pageSize":50,"queryObject":{"goodsInfo":"","barCodeInfo":"","fromOrderNo":"","purModeList":[],"accountDate1":"","accountDate2":"","tbStatus":0,"hosId":"%s"}},"idList":["%s","%s"],"hosId":"%s"}
 "payload9": {"pageNum":1,"pageSize":50,"queryObject":{"invoiceNumber":"","invoiceDate1":"%s","invoiceDate2":"%s","tbStatus":"10","hosId":"%s"},"hosId":"%s"}

data/b6_spd3_core_business_flow_database_check/data

@@ -346,7 +346,35 @@
 "mcms_psi_dept_out_0913": '{"id":"%s","order_no":"%s","bill_mode":"25","rec_type":"YND","psi_flag":-1,"psi_kind":"203","stock_kind":"CK_TK","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":0,"patient_id":null,"patient_name":null,"machine_id":null,"machine_name":null,"his_charge_no":null,"remark":null,"tb_status":40,"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":2,"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_batch_out_0913": '{"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","psi_price":Decimal("99.999900"),"qty":Decimal("1.00"),"unit_name":"1支","barcode_id":"%s","sub_barcode_id":null,"shelf_code":"%s-2-01-01","settle_flag":0,"tb_status":0,"pur_task_id":null,"create_user":"%s","create_time":%s,"last_modified":%s,"last_modified_user":%s,"version":0}'
+"mcms_psi_batch_out_0913": '{"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","psi_price":Decimal("99.999900"),"qty":Decimal("1.00"),"unit_name":"1支","barcode_id":"%s","sub_barcode_id":null,"shelf_code":"%s-2-01-01","settle_flag":0,"tb_status":0,"pur_task_id":null,"create_user":"%s","create_time":%s,"last_modified":%s,"last_modified_user":%s,"version":0}'
 
 #跟台中心库出库主表
 "check_mcms_psi_out_0913": '{"id":"%s","order_no":"%s","bill_mode":"25","rec_type":"YND","psi_flag":1,"psi_kind":"103","stock_kind":"RK_TK","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":"默认库区","remark":null,"tb_status":30,"accounter":"%s","account_date":%s,"bill_relation_json":"{"pickOrderNo":"%s","pickBillId":"%s","psiDeptOutBillId":"%s","psiDeptOutOrderNo":"%s","psiInBillId":"%s","psiInOrderNo":"%s"}","reject_time":null,"reject_remark":null,"create_user":"%s","create_time":%s,"last_modified":%s,"last_modified_user":"%s","version":1,"last_auditor":null,"last_audit_time":null,"reject_user":null,"initial_order":null,"source_type":"SG","reject_reason":null,"receipt_status":0}'
+
+
+#中心库退货出库子表
+"mcms_psi_batch_out_0918": '{"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","psi_price":Decimal("99.999900"),"qty":Decimal("100.00"),"unit_name":"100支/100","barcode_id":"%s","sub_barcode_id":null,"shelf_code":"%s-2-01-01","settle_flag":1,"tb_status":0,"pur_task_id":null,"create_user":"%s","create_time":%s,"last_modified":%s,"last_modified_user":"%s","version":0}'
+
+#中心库退货出库主表
+"check_mcms_psi_out_0918": '{"id":"%s","order_no":"%s","bill_mode":"16","rec_type":"YND","psi_flag":-1,"psi_kind":"299","stock_kind":"CK_TH","target_corp_id":"%s","target_branch_id":null,"target_dept_id":"%s","target_dept_name":"%s","target_stock_id":"%s","target_area_code":null,"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":"%s","remark":"","tb_status":%s,"accounter":"%s","account_date":%s,"bill_relation_json":"{"pickOrderNo":"%s","pickBillId":"%s","psiOutBillId":"%s","psiOutOrderNo":"%s"}","reject_time":null,"reject_remark":null,"create_user":"%s","create_time":%s,"last_modified":%s,"last_modified_user":"%s","version":1,"last_auditor":null,"last_audit_time":null,"reject_user":null,"initial_order":null,"source_type":"SG","reject_reason":null,"receipt_status":1}'
+
+#中心库退货出库_待结算数据主表
+"check_mcms_out_un_balance_0918": '{"id": "%s", "hos_id": "%s", "branch_id": "%s", "tb_status": 0, "prov_id": "%s", "sub_prov_id": "%s", "settle_dept_id": "%s", "distr_detail_id": "%s", "hos_batch_id": "%s", "bar_id": "%s", "bar_code": "%s", "pur_mode": 10, "from_id": "%s", "from_order_no": "%s", "from_table": "mcms_psi_batch", "from_kind": "CK_TH", "account_date": %s, "account_user_id": "%s", "hos_goods_id": "%s", "goods_code": "%s", "price": Decimal("99.999900"), "settle_un_qty": Decimal("-100.00"), "settle_amount": Decimal("-9999.990000"), "hos_unit": "支", "contract_id": None, "normal_contract_id": None, "normal_detail_id": None, "confirm_status": 0, "temp_purchase": 0, "settle_type": 1, "settle_way": 0, "fcat_id": None, "fcat_name": None, "charging_flag": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "online_kind": "10", "charge_dept_id": "%s"}'
+
+
+#中心库退货出库_结算数据主表
+"check_mcms_out_balance_0918": '{"id": "%s", "order_no": "%s", "branch_id": "%s", "hos_id": "%s", "prov_id": "%s", "prov_name": "%s", "settle_dept_id": None, "tb_status": 0, "sum_row": 2, "settle_amount": Decimal("0.000000"), "settle_way": 0, "settle_month": "%s", "settle_start_time": %s, "settle_end_time": %s, "remark": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "check_msg": None, "settle_qty": Decimal("0.0000"), "check_user": None, "check_time": None}'
+#中心库退货出库_结算数据子表
+
+"check_mcms_out_balance_detail_0918_1": '{"id": "%s", "pid": "%s", "prov_id": "%s", "prov_name": "%s", "sub_prov_id": "%s", "sub_prov_name": "%s", "out_dept_id": "%s", "out_dept_name": "%s", "account_date": %s, "pur_mode": 10, "from_table": "mcms_psi_batch", "from_id": "%s", "from_order_no": "%s", "hos_goods_id": "%s", "bar_id": "%s", "bar_code": "%s", "distr_detail_id": "%s", "hos_batch_id": "%s", "tb_status": 10, "price": Decimal("99.999900"), "settle_qty": Decimal("-100.00"), "invoice_qty": Decimal("0.00"), "settle_amount": Decimal("-9999.9900"), "un_settle_id": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "settle_type": 1, "contract_id": None, "normal_contract_id": None, "temp_purchase": 0, "hos_id": "%s", "fcat_id": None, "invoice_price": Decimal("99.999900"), "online_kind": "10"}'
+
+"check_mcms_out_balance_detail_0918_2": '{"id": "%s", "pid": "%s", "prov_id": "%s", "prov_name": "%s", "sub_prov_id": "%s", "sub_prov_name": "%s", "out_dept_id": "%s", "out_dept_name": "%s", "account_date": %s, "pur_mode": 10, "from_table": "mcms_psi_batch", "from_id": "%s", "from_order_no": "%s", "hos_goods_id": "%s", "bar_id": "%s", "bar_code": "%s", "distr_detail_id": "%s", "hos_batch_id": "%s", "tb_status": 10, "price": Decimal("99.999900"), "settle_qty": Decimal("100.00"), "invoice_qty": Decimal("0.00"), "settle_amount": Decimal("9999.9900"), "un_settle_id": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "settle_type": 1, "contract_id": None, "normal_contract_id": None, "temp_purchase": 0, "hos_id": "%s", "fcat_id": None, "invoice_price": Decimal("99.999900"), "online_kind": "10"}'
+
+
+#中心库退货出库_结算数据主表_审批后
+"check_mcms_out_balance_0919": '{"id": "%s", "order_no": "%s", "branch_id": "%s", "hos_id": "%s", "prov_id": "%s", "prov_name": "%s", "settle_dept_id": None, "tb_status": 20, "sum_row": 2, "settle_amount": Decimal("0.000000"), "settle_way": 0, "settle_month": "%s", "settle_start_time": %s, "settle_end_time": %s, "remark": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "check_msg": "22", "settle_qty": Decimal("0.0000"), "check_user": "%s", "check_time": %s}'
+#中心库退货出库_结算数据子表_审批后
+
+"check_mcms_out_balance_detail_0919_1": '{"id": "%s", "pid": "%s", "prov_id": "%s", "prov_name": "%s", "sub_prov_id": "%s", "sub_prov_name": "%s", "out_dept_id": "%s", "out_dept_name": "%s", "account_date": %s, "pur_mode": 10, "from_table": "mcms_psi_batch", "from_id": "%s", "from_order_no": "%s", "hos_goods_id": "%s", "bar_id": "%s", "bar_code": "%s", "distr_detail_id": "%s", "hos_batch_id": "%s", "tb_status": 10, "price": Decimal("99.999900"), "settle_qty": Decimal("-100.00"), "invoice_qty": Decimal("0.00"), "settle_amount": Decimal("-9999.9900"), "un_settle_id": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "settle_type": 1, "contract_id": None, "normal_contract_id": None, "temp_purchase": 0, "hos_id": "%s", "fcat_id": None, "invoice_price": Decimal("99.999900"), "online_kind": "10"}'
+
+"check_mcms_out_balance_detail_0919_2": '{"id": "%s", "pid": "%s", "prov_id": "%s", "prov_name": "%s", "sub_prov_id": "%s", "sub_prov_name": "%s", "out_dept_id": "%s", "out_dept_name": "%s", "account_date": %s, "pur_mode": 10, "from_table": "mcms_psi_batch", "from_id": "%s", "from_order_no": "%s", "hos_goods_id": "%s", "bar_id": "%s", "bar_code": "%s", "distr_detail_id": "%s", "hos_batch_id": "%s", "tb_status": 10, "price": Decimal("99.999900"), "settle_qty": Decimal("100.00"), "invoice_qty": Decimal("0.00"), "settle_amount": Decimal("9999.9900"), "un_settle_id": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "settle_type": 1, "contract_id": None, "normal_contract_id": None, "temp_purchase": 0, "hos_id": "%s", "fcat_id": None, "invoice_price": Decimal("99.999900"), "online_kind": "10"}'
\ No newline at end of file