脚本优化

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

@@ -19,54 +19,85 @@ case_tag:api,b6_spd3_core_business_flow_database_check,a_b3流程十请领业务
 核心业务流:a_b3流程十请领业务流_二级库向边仓
 python runner_test.py tag id2303-13 debug mdm3
 """
+
+
 def check_mcms_dept_buy(type):
-    import pdb
-    pdb.set_trace()
-    if type==1:#低值
+    if type == 1:  # 低值
         hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
-        branch_id=get_branch_id()
-        #获取每次都会变化的字段create_time的值
-        create_time=get_dynamic_change_value("select create_time from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s';"% (branch_id, hos_goods_id))
-        id=get_dynamic_change_value("select id from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s';"% (branch_id, hos_goods_id))
-        print('create_time',create_time,'id',id)
+        branch_id = get_branch_id()
+        # 获取每次都会变化的字段create_time的值
+        create_time = get_create_time(
+            "select create_time from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s';" % (
+                branch_id, hos_goods_id))
+        print('create_time',create_time)
+        id = get_id(
+            "select id from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s';" % (branch_id, hos_goods_id))
+        print('id',id)
+        create_user = get_id(
+            "select create_user from mcms_dept_buy_car where branch_id='%s'and hos_goods_id='%s' LIMIT 1;" % (
+                branch_id, hos_goods_id))
+        print('create_time', create_time, 'id', id)
         sql = """select * from mcms_dept_buy_car where branch_id='%s' and hos_goods_id='%s' LIMIT 1;
                  """ % (branch_id, hos_goods_id)
         actual_value1 = check_mcms_dept_buy_car(sql)
         print(actual_value1)
-        # print('actual_value2',actual_value1)
+        deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
+        deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+        areaCode = get_stockAreaId_new(deptid2, deptname2, 2)
+        areaName = '默认库区'
+        # 读取文件中的信息
+        info = FileUtils().r_info8('b5_spd3_core_business_flow', "二级库请领产品信息", 'message21')
+        list_a = info['list_a']
+        mdm_goods_code = commonFuc().analysis_json('mdmGoodsCode', list_a)
+        pur_mode = commonFuc().analysis_json('purMode', list_a)
+        goodsCode = commonFuc().analysis_json('goodsCode', list_a)
+        pkgDefId = commonFuc().analysis_json('pkgDefId', list_a)
+        pkgDefName = commonFuc().analysis_json('pkgDefName', list_a)
+        last_modified_user = create_user
+        last_modified = create_time
+        # print('actual_value1',actual_value1)
         actual_value2 = get_process_list2(actual_value1)
-        # print('actual_value2', actual_value2, type(actual_value2))
+        # print('actual_value2')
+        # print( actual_value2)
         # prov_hos_goods_id = '8d6273b7bca84dd8aace12b9422d7fd6'
-        expected_value2 = commonFuc().get_business_data('b5_spd3_core_business_flow', 'check_mcms_dept_buy_car', id,get_hosid(),branch_id,dept_id,area_code)
-        print('expected_value2', expected_value2)
-        # actual_value2 = actual_value2.replace(" ", "")
-        # expected_value2 = expected_value2.replace(" ", "")
-        # print(actual_value2 == expected_value2)
-        # if actual_value2 == expected_value2:
-        #     print('ok')
-        #     commonFuc().check_text_exist_result_text('succees', 'succees')
-        # else:
-        #     print('error')
-        #     commonFuc().check_text_exist_result_text('error', 'succees')
-
+        expected_value2 = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
+                                                        'check_mcms_dept_buy_car', id, get_hosid(), branch_id, deptid2,
+                                                        deptname2, areaCode, areaName, hos_goods_id, mdm_goods_code,
+                                                        goodsCode, pkgDefId, pkgDefName
+                                                        , create_user, create_time, last_modified, last_modified_user)
+        # print('expected_value2', expected_value2)
+        # expected_value2=get_process_list2(expected_value2)
+        actual_value2 = actual_value2.replace(" ", "")
+        expected_value2 = expected_value2.replace(" ", "")
+        # print('actual_value2',actual_value2)
+        print('expected_value2')
+        print(expected_value2)
+        print('actual_value2')
+        print(actual_value2)
+        if actual_value2 == expected_value2:
+            print('ok')
+            commonFuc().check_text_exist_result_text('succees', 'succees')
+        else:
+            print('error')
+            commonFuc().check_text_exist_result_text('error', 'succees')
 
 
 try:
-    check_mcms_dept_buy(1)
-
     set_dept_lead()  # 设置二级科室负责人
     # 科室必须同步到外网，集中管控平台创建边仓才能选择到用户,"deptType":"0"
     pro_path = commonFuc().get_pro_path2()
-    print('pro_path',pro_path)
+    print('pro_path', pro_path)
     sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air')
     using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b3流程十请领业务流_二级库向边仓.air')
     from a_b3流程十请领业务流_二级库向边仓 import add_logic_stock
+
     add_logic_stock()
 
     from a_b3流程十请领业务流_二级库向边仓 import goods_move
     from a_b3流程十请领业务流_二级库向边仓 import second_dept_Request
     from a_b3流程十请领业务流_二级库向边仓 import BuyCarSubmit
     from a_b3流程十请领业务流_二级库向边仓 import check_buyWayText
+
     # # 设置产品出库渠道为边仓
     goods_move()
     updateUserLoginDefaultRange(get_listUserMgrRangePage(2))  # 设置登录账号默认权限是二级库

air_case/demo/产品检查.air/产品检查.py

@@ -18,19 +18,19 @@ from airtest.core.api import using
 import sys
 
 # 第一种方式===========================
-hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
-actual_value=delData().check_goods_info(hos_goods_id)
-print('actual_value',actual_value)
-expected_value=commonFuc().get_business_data('b5_spd3_core_business_flow','expected_value')
-print('expected_value',expected_value)
-actual_value = actual_value.replace(" ", "")
-expected_value = expected_value.replace(" ", "")
-if actual_value==expected_value:
-    print('ok')
-    commonFuc().check_text_exist_result_text('succees', 'succees')
-else:
-    print('error')
-    commonFuc().check_text_exist_result_text('error', 'succees')
+# hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
+# actual_value=delData().check_goods_info(hos_goods_id)
+# print('actual_value',actual_value)
+# expected_value=commonFuc().get_business_data('b5_spd3_core_business_flow','expected_value')
+# print('expected_value',expected_value)
+# actual_value = actual_value.replace(" ", "")
+# expected_value = expected_value.replace(" ", "")
+# if actual_value==expected_value:
+#     print('ok')
+#     commonFuc().check_text_exist_result_text('succees', 'succees')
+# else:
+#     print('error')
+#     commonFuc().check_text_exist_result_text('error', 'succees')
 # 第一种方式===========================
 
 
@@ -41,11 +41,15 @@ print(actual_value1)
 # print('actual_value2',actual_value1)
 actual_value2 = get_process_list2(actual_value1)
 print('actual_value2', actual_value2, type(actual_value2))
-prov_hos_goods_id = '8d6273b7bca84dd8aace12b9422d7fd6'
+prov_hos_goods_id = '7be89fe4c5ee4689a5e249d3197b9947'
 expected_value2 = commonFuc().get_business_data('b5_spd3_core_business_flow', 'expected_value2', prov_hos_goods_id)
+expected_value2=get_process_list2(expected_value2)
 print('expected_value2', expected_value2, type(expected_value2))
 actual_value2 = actual_value2.replace(" ", "")
 expected_value2 = expected_value2.replace(" ", "")
+print(actual_value2)
+print(expected_value2)
+
 print(actual_value2 == expected_value2)
 if actual_value2 == expected_value2:
     print('ok')

common/db/sql/sql_tools.py

@@ -111,15 +111,27 @@ def check_mcms_dept_buy_car(sql):
     res_dict = get_dict_data_sql(cursor, sql)
     print('res_dict', res_dict)
     return res_dict
-def get_dynamic_change_value(sql):
+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(')', '')
+    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(',', '')
-    print(new_str1)
+    new_str1 = new_str1.replace("'", '')
+    # print(new_str1)
     cursor.close()
     return new_str1
 

data/b5_spd3_core_business_flow/data

@@ -449,4 +449,4 @@ json_headers2: {
 "payload69": {"stockId": "%s","stockName": "%s","areaCode": "%s","areaName": "%s","barCodeList": [{"id": "%s","lastModified": null,"version": null,"createTime": "%s","createUser": null,"lastModifiedUser": null,"snCode": "%s","hosId": "%s","branchId": null,"stockId": "%s","areaCode": "%s","areaName": "%s","shelfCode": "%s","codeType": "%s","tagType": 0,"hosGoodsId": "%s","mdmGoodsCode": "%s","goodsCode": "%s","goodsDi": "%s","barName": "%s","batchCode": "%s","expdtDate": "%s","productDate": "%s","mfrCode": null,"mfrCodeSee": null,"pkgCode": "%s","pkgCodeSee": "%s","ssccCode": "%s","extInfo": null,"outId": null,"tbStatus": "%s","goodsCodeDi": null,"barcodeId": null,"ext": {"pkgDefId": "%s","pkgDefQty": "%s","purBillId": "%s","pkgDefName": "%s","distrBillId": "%s","inStockTime": "%s","distrDetailId": "%s","certificateCode": ""},"sourceDetailId": null,"purMode": "%s","purModes": null,"price":"%s","pid": null,"goodsMfrsName": "%s","mfrsName": null,"goodsSpec": "%s","unit": "%s","goodsName": "%s","pkgDefId": "%s","pkgDefQty": "%s","defaultPkgDefQty": null,"defaultQty": null,"defaultSurplusQty": null,"defaultPkgDefId": null,"purDetailId": null,"pkgDefName": "%s","printNum": "%s","deptId": null,"deptName": null,"billId": null,"taskId": null,"made": "%s","provId": null,"provName": null,"subProvId": null,"subProvName": null,"provHosGoodsId": null,"sourceType": null,"taskDate": null,"sourceOrderNo": null,"taskType": null,"detailId": null,"branchGoodsPkgDefList": null,"unitName": "%s","areaCodeList": null,"diType": null,"mdmGoodsSpecCode": null,"hosGoodsCode": "%s","supplyId": null,"inSettlement": null,"spdGoodsCode": null,"codeKind": null,"brand": null,"miCode": "","transferRatio": 1,"miDjmc": "","tbStatusList": null,"purModeText": "%s","stockName": null,"tbStatusText": null,"pkgType": null,"bottleId": null,"pkgStatus": null,"qty": 1,"packUnit": null,"minSaleQty": null,"rfidFlag": null,"mfrCodeFlag": null,"scanStatus": null,"scanId": null,"multiChargeFlag": null,"useFrequency": null,"chargeUnit": null,"lockStatus": null,"remark": null,"hosBatchId": null,"settleFlag": null,"inStockTime": null,"verifyFlag":null}],"pickType": "CB","tbStatus": "%s"}
 
 "expected_value": "('00004260', 'h0347', 'p1e2ca', '177df1fadf39415ea5ce40e64edf449d', None, '11661208', '11661208', '11661208', '一次性注射器_低值hMY2F','一次性注射器', 'mfrs-11229', '德国歌德公司 Geuder AG', '', None, '', 'ycxzsq_dzhMY2F', None, '支', 'G-31891', Decimal('1.000000'), 2, '3', 10, None, None, '', None, Decimal('99.9999'), None, '德国', None, None, '', 1, None, 0, None, 0, '', '', None, None, 1, 0, 1, 'p1e2ca:UID-051951', datetime.datetime(2024, 6, 26, 7, 1, 39), 'p1e2ca:UID-051951', 0, 0, 1, None)"
-"expected_value2": '{"hos_goods_code": "00004249","hos_id": "h0347","prov_id": "p1e2c6","prov_hos_goods_id": "%s","srv_id": null,"mdm_goods_code": "11661197","mdm_goods_spec_code": "11661197","spd_goods_code": "11661197","goods_name": "一次性注射器_低值qPW6a","goods_general_name": "一次性注射器","goods_mfrs_id": "mfrs-11229","goods_mfrs_name": "德国歌德公司 Geuder AG","goods_reg_cert": "","goods_agent_mfrs_id": null,"brand": "","short_pinyin": "ycxzsq_dzqPW6a","kind_sixtyeight_code": null,"unit": "支","goods_spec": "G-31891","goods_package": Decimal("1.000000"),"bar_code_mng": 2,"unique_code_strategy": "3","pur_mode": 10,"sub_pur_mode": null,"erp_code": null,"herp_code": "","hrp": null,"price": Decimal("99.9999"),"abroad_flag": null,"made": "德国","property": null,"mgr_level": null,"goods_desc": "","charge_flag": 1,"focus_control_type": null,"temp_flag": 0,"official_status": null,"focus_control": 0,"storage_conditions": "","transport_conditions": "","into_cost_flag": null,"rfid_flag": null,"purchase_flag": 1,"tb_status": 0,"version": 1,"create_user": "p1e2c6:UID-051946","create_time": datetime.datetime(2024,6,25,7,1,34),"last_modified_user": "p1e2c6:UID-051946","sterilize_flag": 0,"multi_charge_flag": 0,"use_frequency": 1,"charge_unit": null}'
+"expected_value2": '{"hos_goods_code": "00004500", "hos_id": "h0347", "prov_id": "p1e32e", "prov_hos_goods_id": "%s", "srv_id": None, "mdm_goods_code": "11661453", "mdm_goods_spec_code": "11661453", "spd_goods_code": "11661453", "goods_name": "一次性注射器_低值wExpg", "goods_general_name": "一次性注射器", "goods_mfrs_id": "mfrs-11229", "goods_mfrs_name": "德国歌德公司 Geuder AG", "goods_reg_cert": "", "goods_agent_mfrs_id": None, "brand": "", "short_pinyin": "ycxzsq_dzwExpg", "kind_sixtyeight_code": None, "unit": "支", "goods_spec": "G-31891", "goods_package": Decimal("1.000000"), "bar_code_mng": 2, "unique_code_strategy": "3", "pur_mode": 10, "sub_pur_mode": None, "erp_code": None, "herp_code": "", "hrp": None, "price": Decimal("99.9999"), "abroad_flag": None, "made": "德国", "property": None, "mgr_level": None, "goods_desc": "", "charge_flag": 1, "focus_control_type": None, "temp_flag": 0, "official_status": None, "focus_control": 0, "storage_conditions": "", "transport_conditions": "", "into_cost_flag": None, "rfid_flag": None, "purchase_flag": 1, "tb_status": 0, "version": 1, "create_user": "p1e32e:UID-052100", "create_time": datetime.datetime(2024, 7, 8, 5, 1, 27), "last_modified_user": "p1e32e:UID-052100", "sterilize_flag": 0, "multi_charge_flag": 0, "use_frequency": 1, "charge_unit": None}'
\ No newline at end of file