Merge remote-tracking branch 'origin/master'

wenleiming
2 parents 8eab3347 e5edcd7d
Showing 2 changed files with 7 additions and 5 deletions
testcase/CZFW/test_weightBizBill_listPage.py
testcase/weightBizBill/test_weighingServiceSave.py
@@ -23,9 +23,10 @@ class test_weightBizBill_listPage(unittest.TestCase):
         self.time=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
         #新增数据
         body=ad.body.copy()
-        body["carTypeId"]=ca.car_list()["data"][0]["id"]
-        body["carTypeName"]=ca.car_list()["data"][0]["carTypeName"]
-        body["carTypeCode"]=ca.car_list()["data"][0]["code"]
+        car=ca.car_list()["data"]
+        body["carTypeId"]=car[0]["id"]
+        body["carTypeName"]=car[0]["carTypeName"]
+        body["carTypeCode"]=car[0]["code"]
         self.re=sy1.post(url=ad.url,headers=ad.header,json=body)
         #刷新防重码
         ad.refresh_commit_token()
@@ -35,7 +36,7 @@ class test_weightBizBill_listPage(unittest.TestCase):
         "称重服务单列表-查询：查询条件为“单据编号”，其余查询条件输入合法值，查询一条指定数据"
         body=bi.body.replace("202108030900001",self.re.json()["data"]["number"]).replace(
             "carTypeId=53","carTypeId={}".format(ca.car_list()["data"][0]["id"])).replace(
-            "depId=139","depId={}".format(my.user["sy_user01"]["departmentId"]))
+            "depId=139","depId={}".format(sy1.user["sy_user01"]["departmentId"]))
         re=sy1.post(url=bi.url,headers=bi.header,data=body)
         print(re.json())
         self.assertEqual(re.status_code, 200)
@@ -27,6 +27,7 @@ class test_weighingServiceSave(unittest.TestCase):
     @unittest.case_mark(my.mark())
     def test_weighingServiceSave_01(self):
         "称重服务：成功新增一条称重服务单"
+        print(self.__doc__)
         body=we.body.copy()
         car=li.car_list()["data"]
         body["carTypeId"]=car[0]["id"]
@@ -45,6 +46,6 @@ class test_weighingServiceSave(unittest.TestCase):
 if __name__ == "__main__":
-    # unittest.main(verbosity=2)
+    unittest.main(verbosity=2)
     com.run_list([test_weighingServiceSave("test_weighingServiceSave_01"),test_weighingServiceSave("test_weighingServiceSave_02")])