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

air_case/b5_spd3_core_business_flow/a_b2流程九请领业务流_二级库向中心库.air/a_b2流程九请领业务流_二级库向中心库.py

@@ -481,7 +481,11 @@ def main():
                             FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2'], 2)
         # get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid3'],FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid3'],3)
         # 设置库区联系人
-        set_stockShelf_Linkman()
+        # set_stockShelf_Linkman()
+        deptName2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+        # 设置库区联系人
+        set_stockShelf_Linkman(FileUtils().r_info8('b2_herp3_bs', '所有科室id', 'message6')["deptid2"],
+                               get_stockAreaId2_new_fromDb(deptName2, 2))
         # 低值
         second_dept_Request(FileUtils().r_info8("b5_spd3_core_business_flow", "产品审核信息", 'message2')['hosGoodsId'], 1)
         # 高值

air_case/public1/public1/public1.py

@@ -3193,10 +3193,11 @@ def second_dept_one_key_in(type=2):
     # # # # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
     print('一键入库result', result)
+    data=commonFuc().analysis_json('data',result)
     code=commonFuc().analysis_json('code',result)
     if code==1010:
         commonFuc().check_text_exist_result_text('error', 'succees')
-
+    return data
     # 一键入库====================================================
 
 

common/db/sql/sql_tools.py

@@ -176,5 +176,17 @@ def get_mdm_goods_code(sql):
     results = cursor.fetchall()
     cursor.close()
     return results
+def check_in_check_mcms_purchase(sql):
+    db, cursor = get_sql_conn()
+    cursor.execute(sql)
+    results = cursor.fetchone()
+    str1 = str(results)
+    new_str1 = str1.replace(',)', '')
+    new_str1 = new_str1.replace('(', '')
+    new_str1 = new_str1.replace(',', '')
+    new_str1 = new_str1.replace("'", '')
+    # print(new_str1)
+    cursor.close()
+    return new_str1
 # hos_goods_id = 'h034700004220'
 # main2(hos_goods_id)
\ No newline at end of file

common/db/sql/sql_tools_out.py

+import pymysql
+
+from common.fileUtls import FileUtils
+
+
+def get_db():
+    # 打开数据库连接
+    db = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd_hdiorder_test2",
+                                     charset="utf8")
+    return db
+
+
+def get_sql_conn():
+    """
+    获取数据库连接
+    """
+    db = get_db()
+    cursor = db.cursor()
+    return db, cursor
+
+
+def get_index_dict(cursor):
+    """
+    获取数据库对应表中的字段名
+    """
+    index_dict = dict()
+    index = 0
+    for desc in cursor.description:
+        index_dict[desc[0]] = index
+        index = index + 1
+    return index_dict
+
+
+def get_dict_data_sql(cursor, sql):
+    """
+    运行sql语句，获取结果，并根据表中字段名，转化成dict格式（默认是tuple格式）
+    """
+    cursor.execute(sql)
+    data = cursor.fetchall()
+    index_dict = get_index_dict(cursor)
+    res = []
+    for datai in data:
+        resi = dict()
+        for indexi in index_dict:
+            resi[indexi] = datai[index_dict[indexi]]
+        res.append(resi)
+    return res
+
+
+
+def check_mcms_dept_buy_car_sql(sql):
+    db, cursor = get_sql_conn()
+    res_dict = get_dict_data_sql(cursor, sql)
+    print('res_dict', res_dict)
+    cursor.close()
+    return res_dict
+def check_mcms_dept_buy_sql(sql):
+    db, cursor = get_sql_conn()
+    res_dict = get_dict_data_sql(cursor, sql)
+    print('res_dict', res_dict)
+    cursor.close()
+    return res_dict
+def check_mcms_pur_plan_sql(sql):
+    db, cursor = get_sql_conn()
+    res_dict = get_dict_data_sql(cursor, sql)
+    print('res_dict', res_dict)
+    cursor.close()
+    return res_dict
+def get_create_time(sql):
+    db, cursor = get_sql_conn()
+    cursor.execute(sql)
+    results = cursor.fetchone()
+    str1 = str(results)
+    new_str1 = str1.replace(',)', '')
+    new_str1 = new_str1.replace('(date', 'date')
+    # new_str1 = new_str1.replace(',', '')
+    # print(new_str1)
+    cursor.close()
+    return new_str1
+def get_expdt_date(sql):
+    db, cursor = get_sql_conn()
+    cursor.execute(sql)
+    results = cursor.fetchone()
+    str1 = str(results)
+    new_str1 = str1.replace(',)', '')
+    new_str1 = new_str1.replace('(date', 'date')
+    # new_str1 = new_str1.replace(',', '')
+    # print(new_str1)
+    cursor.close()
+    return new_str1
+def get_id(sql):
+    db, cursor = get_sql_conn()
+    cursor.execute(sql)
+    results = cursor.fetchone()
+    str1 = str(results)
+    new_str1 = str1.replace(',)', '')
+    new_str1 = new_str1.replace('(', '')
+    new_str1 = new_str1.replace(',', '')
+    new_str1 = new_str1.replace("'", '')
+    # print(new_str1)
+    cursor.close()
+    return new_str1
+def get_dept_buy_id(sql):
+    db, cursor = get_sql_conn()
+    cursor.execute(sql)
+    results = cursor.fetchall()
+    cursor.close()
+    return results
+def process_tuple(tuple1):
+    str1 = str(tuple1)
+    new_str1 = str1.replace(',)', '')
+    new_str1 = new_str1.replace('(', '')
+    new_str1 = new_str1.replace(',', '')
+    new_str1 = new_str1.replace("'", '')
+    return new_str1
+
+def get_mdm_goods_code(sql):
+    db, cursor = get_sql_conn()
+    cursor.execute(sql)
+    results = cursor.fetchall()
+    cursor.close()
+    return results
+def check_out_check_mcms_purchase(sql):
+    db, cursor = get_sql_conn()
+    cursor.execute(sql)
+    results = cursor.fetchone()
+    str1 = str(results)
+    new_str1 = str1.replace(',)', '')
+    new_str1 = new_str1.replace('(', '')
+    new_str1 = new_str1.replace(',', '')
+    new_str1 = new_str1.replace("'", '')
+    # print(new_str1)
+    cursor.close()
+    return new_str1
+# hos_goods_id = 'h034700004220'
+# main2(hos_goods_id)
\ No newline at end of file

data/b6_spd3_core_business_flow_database_check/data

@@ -32,4 +32,12 @@
 
 
 "mcms_pur_plan_detail": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_id": "%s", "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "pur_mode": 10, "pkg_def_id": "%s", "pkg_def_name": "100", "pkg_def_qty": Decimal("100.00"), "plan_pkg_qty": Decimal("1.00"), "plan_qty": Decimal("100.00"), "pkg_qty": Decimal("1.00"), "price": Decimal("99.999900"), "qty": Decimal("100.00"), "in_settlement": None, "supply_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "sub_prov_id": "%s", "sub_prov_name": "%s", "contract_id": None, "remark": None, "close_status": 0, "tb_status": 10, "pur_task_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "coding_type": 0}'
-"mcms_pur_plan_detail2": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_id": "%s", "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "pur_mode": 20, "pkg_def_id": None, "pkg_def_name": None, "pkg_def_qty": Decimal("1.00"), "plan_pkg_qty": Decimal("1.00"), "plan_qty": Decimal("1.00"), "pkg_qty": Decimal("1.00"), "price": Decimal("99.999900"), "qty": Decimal("1.00"), "in_settlement": None, "supply_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "sub_prov_id": "%s", "sub_prov_name": "%s", "contract_id": None, "remark": None, "close_status": 0, "tb_status": 10, "pur_task_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "coding_type": 0}'
\ No newline at end of file
+"mcms_pur_plan_detail2": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_id": "%s", "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "pur_mode": 20, "pkg_def_id": None, "pkg_def_name": None, "pkg_def_qty": Decimal("1.00"), "plan_pkg_qty": Decimal("1.00"), "plan_qty": Decimal("1.00"), "pkg_qty": Decimal("1.00"), "price": Decimal("99.999900"), "qty": Decimal("1.00"), "in_settlement": None, "supply_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "sub_prov_id": "%s", "sub_prov_name": "%s", "contract_id": None, "remark": None, "close_status": 0, "tb_status": 10, "pur_task_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "coding_type": 0}'
+"mcms_pur_plan_detail3": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_id": "%s", "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "pur_mode": 60, "pkg_def_id": "%s", "pkg_def_name": "100", "pkg_def_qty": Decimal("100.00"), "plan_pkg_qty": Decimal("1.00"), "plan_qty": Decimal("100.00"), "pkg_qty": Decimal("1.00"), "price": Decimal("99.999900"), "qty": Decimal("100.00"), "in_settlement": None, "supply_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "sub_prov_id": "%s", "sub_prov_name": "%s", "contract_id": None, "remark": None, "close_status": 0, "tb_status": 10, "pur_task_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "coding_type": 0}'
+
+
+"mcms_purchase": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "rec_type": "HDI", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "area_code": "%s", "area_name": "%s", "bill_expdt_date": %s, "source_id": "%s", "source_type": "CGJH", "in_settlement": None, "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s"}", "ext_info": "{"epidemicFlag":0,"purMode":10}", "barcode_flag": 1, "pkg_flag": 1, "remark": "", "priority": 0, "close_status": 0, "close_date": %s, "up_status": 0, "tb_status": 30, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": None, "version": 0, "del_flag": 0, "last_auditor": "%s", "last_audit_time": %s}'
+"mcms_purchase2": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "rec_type": "HDI", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "area_code": "%s", "area_name": "%s", "bill_expdt_date": %s, "source_id": "%s", "source_type": "CGJH", "in_settlement": None, "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s"}", "ext_info": "{"epidemicFlag":0,"purMode":20}", "barcode_flag": 1, "pkg_flag": 0, "remark": "", "priority": 0, "close_status": 0, "close_date": %s, "up_status": 0, "tb_status": 30, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": None, "version": 0, "del_flag": 0, "last_auditor": "%s", "last_audit_time": %s}'
+"mcms_purchase3": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "HDI", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "area_code": "%s", "area_name": "%s", "bill_expdt_date": %s, "source_id": "%s", "source_type": "CGJH", "in_settlement": None, "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s"}", "ext_info": "{"epidemicFlag":0,"purMode":60}", "barcode_flag": 1, "pkg_flag": 1, "remark": "", "priority": 0, "close_status": 0, "close_date": %s, "up_status": 0, "tb_status": 30, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": None, "version": 0, "del_flag": 0, "last_auditor": "%s", "last_audit_time": %s}'
+
+"hdi_distr": '{"id": "PSh0347202407160001", "order_no": "PSh0347202407160001", "bill_mode": "16", "rec_type": "YND", "hos_id": "h0347", "hos_name": "邹城市人民医院(test)", "branch_id": "h0347-3755", "source_id": "Ch034720240716000007", "source_type": "CGD", "pur_bill_id": "Ch034720240716000007", "prov_id": "p1e35e", "prov_name": "国药集团公司S57ui", "sub_send_flag": 10, "exe_prov_id": "p1e35e", "exe_prov_name": "国药集团公司S57ui", "settlement": None, "pur_dept_id": "63c734f07fcc422ea80f49ca8e5bbd95", "pur_dept_name": "设备科001", "rec_org_id": "63c734f07fcc422ea80f49ca8e5bbd95", "rec_org_name": "设备科001", "rec_user": "自动化测试w&vqF", "rec_phone": "xhs", "rec_addr": "自动化测试", "bill_relation_json": "{"planBillId":"Ph034720240716029565","planOrderNo":"PLAN2024071632920","purOrderNo":"CG2024071621454","purBillId":"Ch034720240716000007","purBillDate":"2024-07-16 08:11:19","distrBillId":"PSh0347202407160001","distrOrderNo":"PSh0347202407160001"}", "ext_info": "{"epidemicFlag":0,"purMode":10,"distrUser":"p1e35e:UID-052165"}", "barcode_flag": 1, "pkg_flag": 1, "remark": "", "task_id": None, "convert_flag": 1, "convert_time": None, "convert_user_name": None, "reject_status": 40, "tb_status": 25, "create_user": "p1e35e:UID-052165", "create_user_name": "国药集团公司S57ui", "create_time": datetime.datetime(2024, 7, 16, 8, 11, 42), "last_modified": datetime.datetime(2024, 7, 16, 8, 12, 53), "last_modified_user": "h0347_UID-051420", "version": 2, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "initial_order": None}'
\ No newline at end of file

report/summary.html

@@ -95,7 +95,7 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         <tr width="600">
             <td class="details-col-elapsed"><a href='../log/r_b8库房管理_库区设置_同步库房信息/log.html' target='_blank'>r_b8库房管理_库区设置_同步库房信息</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">8.451</td>
+            <td class="details-col-elapsed">8.311</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>