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

air_case/b5_spd3_core_business_flow/a_b4流程十一请领业务流_二级库向直送.air/a_b4流程十一请领业务流_二级库向直送.py

@@ -870,4 +870,4 @@ def main():
         print('==========================流程十一结束==============================')
     except:
         commonFuc().check_text_exist_result_text('error', '1')
-main()
\ No newline at end of file
+# main()
\ No newline at end of file

air_case/public1/public1/public1.py

@@ -342,6 +342,11 @@ def get_stockId(name, type=1):  # 获取仓库id参数是库房名称
             id3 = i['id']
             print(id3)
             return id3
+def get_stockId_fromdb(name, type=1):  # 获取仓库id参数是库房名称
+
+    stockId=process_tuple(
+        get_id("select id from mcms_stock_info where stock_name='%s'and branch_id='h0347-3754';" % name))
+    return stockId
 
 
 def dept_query_all():  # 科室查询，将科室id写入文件中
@@ -1816,6 +1821,30 @@ def get_stockAreaId_new(dept_id, deptName, type=1):
     FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '库区信息', titlename, 'message22')
     return shelfCode
 
+def get_stockAreaId_new_fromDb(dept_id, deptName, type=1):
+    module = "b2_herp3_bs"
+    stockId = 'stockId'
+    # 获取库房id=========     开始====
+    if type == 1:
+    # 中心库房名称
+        branch_name = FileUtils().r_info(module, '院区新增')["branch_name"]
+        stockId = get_stockId_fromdb(branch_name + '中心库房')
+    # 二级库房名称
+    elif type == 2:
+        stockId = get_stockId_fromdb(deptName + '库房', 2)
+        print(stockId)
+    elif type == 3:
+        stockId = get_stockId_fromdb(deptName + '库房', 3)
+        print(stockId)
+
+    # 获取库房id==========结束============
+
+    # ====获取库区id===== 开始==========
+    sql="select shelf_code from mcms_stock_shelf where stock_Id='%s'and address='%s';"%(stockId,deptName)
+    print(sql)
+    shelfCode=get_id(sql)
+    return shelfCode
+
 
 def herpService_mcmsDeptGoodsInfo_getByProvIdPage():  # 高值跟台获取产品信息
     module = "b5_spd3_core_business_flow"

common/db/sql/sql_tools.py

@@ -116,6 +116,12 @@ def check_mcms_dept_buy_sql(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)

data/b6_spd3_core_business_flow_database_check/data

@@ -15,3 +15,17 @@
 "mcms_dept_buy_detail_approval_after": '{"id": "%s", "pid": "%s", "order_no": "%s", "order_num": 1, "source_id": None, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "price": Decimal("99.999900"), "pur_mode": 10, "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"), "send_pkg_qty": "0", "send_qty": "0", "rec_pkg_qty": "0", "rec_qty": "0", "tb_status": 40, "close_type": 0, "remark": None, "close_remark": None, "close_time": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "re_order_no": None, "coding_type": 0}'
 "mcms_dept_buy_detail_approval_after1": '{"id": "%s", "pid": "%s", "order_no": "%s", "order_num": 1, "source_id": None, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "price": Decimal("99.999900"), "pur_mode": 20, "pkg_def_id": %s, "pkg_def_name": %s, "pkg_def_qty": Decimal("1.00"), "buy_pkg_qty": Decimal("1.00"), "buy_qty": Decimal("1.00"), "send_pkg_qty": "0", "send_qty": "0", "rec_pkg_qty": "0", "rec_qty": "0", "tb_status": 40, "close_type": 0, "remark": None, "close_remark": None, "close_time": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "re_order_no": None, "coding_type": 0}'
 "mcms_dept_buy_detail_approval_after2": '{"id": "%s", "pid": "%s", "order_no": "%s", "order_num": 1, "source_id": None, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "price": Decimal("99.999900"), "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"), "send_pkg_qty": "0", "send_qty": "0", "rec_pkg_qty": "0", "rec_qty": "0", "tb_status": 40, "close_type": 0, "remark": None, "close_remark": None, "close_time": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "re_order_no": None, "coding_type": 0}'
+
+"mcms_dept_buy_direct_sending": '{"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": "3", "create_type": "SG", "buy_kind": "QL", "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": "None", "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_buy_direct_sending2": '{"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": "3", "create_type": "SG", "buy_kind": "QL", "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": "None", "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_buy_direct_sending3": '{"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": "3", "create_type": "SG", "buy_kind": "QL", "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": "None", "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_buy_approval_after4": '{"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": "3", "create_type": "SG", "buy_kind": "QL", "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": "22", "audit_remark": None, "close_remark": None, "srv_id": None, "srv_name": None, "gen_status": 0, "close_status": 0, "tb_status": 40, "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": "%s", "last_audit_time": %s, "close_time": None, "old_order_no": None}'
+"mcms_dept_buy_approval_after5": '{"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": "3", "create_type": "SG", "buy_kind": "QL", "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": "22", "audit_remark": None, "close_remark": None, "srv_id": None, "srv_name": None, "gen_status": 0, "close_status": 0, "tb_status": 40, "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": "%s", "last_audit_time": %s, "close_time": None, "old_order_no": None}'
+"mcms_dept_buy_approval_after6": '{"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": "3", "create_type": "SG", "buy_kind": "QL", "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": "22", "audit_remark": None, "close_remark": None, "srv_id": None, "srv_name": None, "gen_status": 0, "close_status": 0, "tb_status": 40, "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": "%s", "last_audit_time": %s, "close_time": None, "old_order_no": None}'
+
+
+"mcms_pur_plan": '{"id": "%s", "order_no": "%s", "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", "create_type": "SG", "source_id": "%s", "source_type": "QLD", "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "priority": 0, "bill_expdt_date": %s, "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s"}", "remark": "", "close_status": 0, "tb_status": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "last_auditor": None, "last_audit_time": None, "rec_type": "HDI", "audit_remark": None}'
+"mcms_pur_plan2": '{"id": "%s", "order_no": "%s", "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", "create_type": "SG", "source_id": "%s", "source_type": "QLD", "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "priority": 0, "bill_expdt_date": %s, "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s"}", "remark": "", "close_status": 0, "tb_status": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "last_auditor": None, "last_audit_time": None, "rec_type": "HDI", "audit_remark": None}'
+"mcms_pur_plan3": '{"id": "%s", "order_no": "%s", "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", "create_type": "SG", "source_id": "%s", "source_type": "QLD", "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "priority": 0, "bill_expdt_date": %s, "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s"}", "remark": "", "close_status": 0, "tb_status": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "last_auditor": None, "last_audit_time": None, "rec_type": "HDI", "audit_remark": None}'
\ No newline at end of file

report/summary.html

@@ -76,9 +76,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
 
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>0分9秒</td>
-            <td class="details-col-elapsed">100.0%</td>
+            <td class='details-col-elapsed'>0</td>
+            <td class='details-col-elapsed'>1分57秒</td>
+            <td class="details-col-elapsed">0.0%</td>
         </tr>
     </table>
 
@@ -93,9 +93,9 @@ setInterval(updateTime, 1000); // 每秒更新一次时间
         </tr>
         
         <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">9.789</td>
+            <td class="details-col-elapsed"><a href='../log/a_b4流程十一请领业务流_二级库向直送_数据库验证/log.html' target='_blank'>a_b4流程十一请领业务流_二级库向直送_数据库验证</a></td>
+            <td class="fail">失败</td>
+            <td class="details-col-elapsed">116.835</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>