Merge remote-tracking branch 'origin/master'

lixi
2 parents 3584627f 5f8af56a
Showing 9 changed files with 530 additions and 72 deletions
commons/api/entranceFeeBillList.py
commons/api/zcApi.py
report/test.log
testcase/FeedbackOrderController/test_feedback_order_settlement.py
testcase/feedbackAccounrecordController_list/test_feedbackAccounrecordController_list.py
testcase/test_ZC/demo.py
testcase/test_ZC/test_ZC.py
testcase/test_ZC/test_ZCBasic.py
testcase/test_ZC/test_ZCCreate.py
@@ -247,9 +247,182 @@ def do_doPay(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
     return res
+def do_payOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032"):
+    a = listPage(host=host, attrName=attrName, attrValue=attrValue)
+    print("listPage", a.json())
+    orderId = a.json()["rows"][0]["id"]
+    number = a.json()["rows"][0]["number"]
+    created = a.json()["rows"][0]["created"]
+    print(orderId)
+
+    # # 订单详情获取
+
+    resOrderDetails = get_OrderDetails(host=host, orderId=orderId)
+    unitPrice = re.findall('name="unitPrice" value="(.*?)" id', resOrderDetails.text)[0]
+    goodsId = re.findall('id="goodsId" value="(.*?)">', resOrderDetails.text)[0]
+    status = re.findall('"status" name="status" value="(.*?)">', resOrderDetails.text)[0]
+    source = re.findall('id="source" name="source" value="(.*?)">', resOrderDetails.text)[0]
+    optType = re.findall('id="optType" name="optType" value="(.*?)">', resOrderDetails.text)[0]
+    correctInfo = re.findall('d="correctInfo" name="correctInfo" value="(.*?)">', resOrderDetails.text)[0]
+    weightType = re.findall('name="weightType" id="weightType" value="(.*?)">', resOrderDetails.text)[0]
+    correctDiscount = re.findall('id="correctDiscount" name="correctDiscount" value="(.*?)">', resOrderDetails.text)[0]
+    regionId = re.findall('<option value="(.*?)" bind-name="', resOrderDetails.text)[0]
+    goodsTagIds = \
+    re.findall('<input name="goodsTagIds" type="radio" value="(.*?)" readonly  checked>', resOrderDetails.text)[0]
+    sumPrice = re.findall('<input type="hidden" name="sumPrice" value="(.*?)" id="sumPrice">', resOrderDetails.text)[0]
+    calcFeeDepId = re.findall('<input type="hidden"  name="calcFeeDepId" value="(.*?)">', resOrderDetails.text)[0]
+    tradeTypeId = \
+    re.findall('input type="hidden" class="form-control" name="tradeTypeId"  value="(.*?)" >', resOrderDetails.text)[0]
+    shareRatio = \
+    re.findall('input type="hidden" id="shareRatioVal" name="shareRatio" value="(.*?)"', resOrderDetails.text)[0]
+    regionName = re.findall('" bind-name="(.*?)"', resOrderDetails.text)[0]
+
+    # 用户信息获取
+    ic = 888810032426
+    res = get_icCheck(host=host, ic=ic)
+    print(res.text)
+    customerId = res.json()["data"]["aInfo"]["customerId"]
+    customerName = res.json()["data"]["aInfo"]["customerName"]
+    accountId = res.json()["data"]["aInfo"]["accountId"]
+    mobile = res.json()["data"]["aInfo"]["mobile"]
+
+    # 省市区获取
+    res = get_city(host=host, name="万州")
+    print(res.text)
+    originId = res.json()["suggestions"][0]["id"]
+    parentId = res.json()["suggestions"][0]["parentId"]
+    value = res.json()["suggestions"][0]["value"]
+
+    # 获取缴费金额
+    # host = "http://test.jmsf.diligrp.com:8385"
+    plate = re.findall('name="plate" class="form-control"  value="(.*?)" id="plate"', resOrderDetails.text)[0]
+    modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+    carTypeName = re.findall('name="carTypeName" id="carTypeName" value="(.*?)" ', resOrderDetails.text)[0]
+    carTypeCode = re.findall('name="carTypeCode" id="carTypeCode" value="(.*?)" ', resOrderDetails.text)[0]
+    carTypeId = re.findall('name="carTypeId" id="carTypeId" value="(.*?)" ', resOrderDetails.text)[0]
+    carTypeWeight = "333"
+    proveType = re.findall(' value="(.*?)" id="proveType" name="proveType"', resOrderDetails.text)[0]
+    proveTypeCode = proveType
+    grossWeight = re.findall('name="grossWeight"  id="grossWeight" value="(.*?)"', resOrderDetails.text)[0]
+    newWeight = re.findall('name="weight" readonly value="(.*?)" id="weight"', resOrderDetails.text)[0]
+    tareWeight = re.findall('name="tareWeight" id="tareWeight" value="(.*?)"', resOrderDetails.text)[0]
+    depName = re.findall('id="depName" name="depName" value="(.*?)"', resOrderDetails.text)[0]
+    feeDepId = re.findall('name="calcDepId" value="(.*?)"', resOrderDetails.text)[0]
+    productName = re.findall('name="productName" value="(.*?)"', resOrderDetails.text)[0]
+    productId = re.findall('id="productId" value="(.*?)"', resOrderDetails.text)[0]
+    grossWeightDate = re.findall('name="grossWeightDate" value="(.*?)"', resOrderDetails.text)[0]
+    tareWeightDate = re.findall('name="tareWeightDate" value="(.*?)"', resOrderDetails.text)[0]
+    weight = re.findall('name="weight" readonly value="(.*?)"', resOrderDetails.text)[0]
+    calcDepId = re.findall('name="calcDepId" value="(.*?)"', resOrderDetails.text)[0]
+    categoryName = "水果"
+    categoryId = "14436"
+    inGreeterName = re.findall('id="inGreeterName" value="(.*?)"', resOrderDetails.text)[0]
+    inGreeterId = re.findall('name="inGreeterId" id="inGreeterId" value="(.*?)"', resOrderDetails.text)[0]
+
+    autocompletecartype = f"{carTypeCode}({carTypeName})"
+    print(autocompletecartype)
+
+    res = get_calculateRes(host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
+                           weightType=weightType, id=orderId, goodsId=goodsId, number=number, modified=modified,
+                           status=status,
+                           source=source, correctDiscount=correctDiscount, plate=plate, carTypeName=carTypeName,
+                           carTypeCode=carTypeCode,
+                           carTypeId=carTypeId, carTypeWeight=carTypeWeight, proveType=proveType,
+                           grossWeight=grossWeight,
+                           tareWeight=tareWeight, unitPrice=unitPrice, depName=depName, productName=productName,
+                           productId=productId, originId=originId, tradeTypeId=tradeTypeId, created=created,
+                           goodsTagIds=goodsTagIds,
+                           shareRatio=shareRatio, categoryName=categoryName, categoryId=categoryId,
+                           grossWeightDate=grossWeightDate,
+                           tareWeightDate=tareWeightDate, sumPrice=sumPrice, calcDepId=calcDepId, weight=weight,
+                           inGreeterName=inGreeterName, inGreeterId=inGreeterId)
+
+    # backSkinTwo = re.findall('name="backSkinTwo" value="(.*?)" >',res.text)[0]
+    # 缴费信息
+    totalMoney = re.findall('name="totalMoney" value="(.*?)">', res.text)[0]
+    discountAmount = re.findall('name="discountAmount" value="(.*?)">', res.text)[0]
+    collectionPrice = re.findall('" name="collectionPrice" value="(.*?)">', res.text)[0]
+    handReceivableAmount = re.findall('name="handReceivableAmount" value="(.*?)">', res.text)[0]
+    correctDiscount = re.findall('id="correctDiscount" name="correctDiscount" value="(.*?)">', res.text)[0]
+    billItemCheckIds = re.findall('" name="billItemCheckIds" value="(.*?)" ', res.text)[0]
+    billItemCheckIdsV = re.findall('" maxlength="15" data-old="(.*?)"', res.text)[0]
+    receivable = re.findall('id="creceivableLong" name="receivable" value="(.*?)">', res.text)[0]
+
+    soup = BeautifulSoup(res.text, "html.parser")
+    # 查找dl标签class为包含'ui-font-'字符的所有dl标签
+    fee_str = "correctDiscount=1&billItems=&billItemsDic="
+    fee_int = 0
+    discount_amount = 0
+    for tag in soup.findAll("div", class_="d-flex align-items-center"):
+        print("=============================================")
+        c = tag.findAll("input")
+        for i in c:
+            print(i)
+            if i.get("name") != None:
+                fee_str = fee_str + "&" + i.get("name") + "=" + urllib.parse.quote(i.get("value"))
+                if i.get("type") == "text":
+                    print("---------------- f 2 s----------------")
+                    print(i)
+                    print(i.get("value"))
+                    fee_int = fee_int + int(float(i.get("value")))
+                    print("---------------- f 2 e----------------")
+                if "优惠" in i.get("value"):
+                    discount_amount = discount_amount + int(json.loads(i.get("value"))["receivable"]) / 100
+                # fee_int = fee_int+int(i.get("value"))
+    # print(fee_str)
+    # print(fee_int)
+    # print("discount_amount",discount_amount)
+    # print("discountAmount",discountAmount)
+
+    pwd = "111111"
+    id = orderId
+    totalAmount = totalMoney
+    customerPhone = mobile
+    productPrice = "1.00000"
+    dep = feeDepId
+    productArea = "重庆,重庆市,万州区"
+    chargeTotalAmount = totalMoney
+    chargeTotalAmountYuan = fee_int - int(discount_amount)
+    freezeMoneySymbol = fee_int
+    comparisonFreezeAmount = fee_int
+    modified = created
+    firmCode = my.userInfo["data"]["user"]["firmCode"]
+    marketFlag = firmCode
+    collectionPrice = 0
+    itemReceivableAmount = receivable
+    receivableAmount = receivable
+    tareWeightDate = tareWeightDate
+    aa = do_doPay(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
+                  weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
+                  source=source,
+                  correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
+                  fundAccount=accountId,
+                  accountId=accountId, ic=ic, customerName=customerName, customerPhone=customerPhone, plate=plate,
+                  carTypeName=carTypeName, carTypeCode=carTypeCode, carTypeId=carTypeId, carTypeWeight=carTypeWeight,
+                  proveType=proveType, grossWeight=grossWeight, tareWeight=tareWeight, weight=weight,
+                  productPrice=productPrice,
+                  unitPrice=unitPrice, depName=depName, calcDepId=calcDepId, dep=dep, regionName=regionName,
+                  regionId=regionId,
+                  productName=productName, productId=productId, productArea=productArea, originId=originId,
+                  tradeTypeId=tradeTypeId, correctInfo=correctInfo, chargeTotalAmount=chargeTotalAmount,
+                  freezeMoneySymbol=freezeMoneySymbol, comparisonFreezeAmount=comparisonFreezeAmount, modified=modified,
+                  goodsTagIds=goodsTagIds, marketFlag=marketFlag, totalMoney=totalMoney, receivable=receivable,
+                  collectionPrice=collectionPrice, discountAmount=discountAmount,
+                  handReceivableAmount=handReceivableAmount,
+                  itemReceivableAmount=itemReceivableAmount, receivableAmount=receivableAmount,
+                  categoryName=categoryName,
+                  categoryId=carTypeId, grossWeightDate=grossWeightDate, tareWeightDate=tareWeightDate,
+                  sumPrice=sumPrice,
+                  chargeTotalAmountYuan=chargeTotalAmountYuan)
+
+    print(aa.text)
+    return aa
+
+# do_payOrder(attrValue="202108060900035")
-a = listPage(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900028")
+"""
+a = listPage(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032")
 print("listPage",a.json())
 orderId = a.json()["rows"][0]["id"]
 number = a.json()["rows"][0]["number"]
@@ -257,15 +430,12 @@ created = a.json()[&quot;rows&quot;][0][&quot;created&quot;]
 print(orderId)
 # # 订单详情获取
-# orderId = 3674
+
 resOrderDetails = get_OrderDetails(host="http://test.jmsf.diligrp.com:8385",orderId=orderId)
-# print(res.text)
 unitPrice = re.findall('name="unitPrice" value="(.*?)" id',resOrderDetails.text)[0]
-
 goodsId = re.findall('id="goodsId" value="(.*?)">',resOrderDetails.text)[0]
 status = re.findall('"status" name="status" value="(.*?)">',resOrderDetails.text)[0]
 source = re.findall('id="source" name="source" value="(.*?)">',resOrderDetails.text)[0]
-
 optType = re.findall('id="optType" name="optType" value="(.*?)">',resOrderDetails.text)[0]
 correctInfo = re.findall('d="correctInfo" name="correctInfo" value="(.*?)">',resOrderDetails.text)[0]
 weightType = re.findall('name="weightType" id="weightType" value="(.*?)">',resOrderDetails.text)[0]
@@ -296,42 +466,29 @@ parentId = res.json()[&quot;suggestions&quot;][0][&quot;parentId&quot;]
 value = res.json()["suggestions"][0]["value"]
 # 获取缴费金额
-plate="川B00001"
 host="http://test.jmsf.diligrp.com:8385"
+plate= re.findall('name="plate" class="form-control"  value="(.*?)" id="plate"',resOrderDetails.text)[0]
 modified=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
 carTypeName= re.findall('name="carTypeName" id="carTypeName" value="(.*?)" ',resOrderDetails.text)[0]
 carTypeCode = re.findall('name="carTypeCode" id="carTypeCode" value="(.*?)" ',resOrderDetails.text)[0]
 carTypeId = re.findall('name="carTypeId" id="carTypeId" value="(.*?)" ',resOrderDetails.text)[0]
 carTypeWeight = "333"
-# proveTypeCode = "1621"
 proveType = re.findall(' value="(.*?)" id="proveType" name="proveType"',resOrderDetails.text)[0]
 proveTypeCode = proveType
-# grossWeight="353"
 grossWeight = re.findall('name="grossWeight"  id="grossWeight" value="(.*?)"',resOrderDetails.text)[0]
-# newWeight="20"
 newWeight = re.findall('name="weight" readonly value="(.*?)" id="weight"',resOrderDetails.text)[0]
-# tareWeight="333"
 tareWeight=re.findall('name="tareWeight" id="tareWeight" value="(.*?)"',resOrderDetails.text)[0]
-# depName="接车部"
 depName = re.findall('id="depName" name="depName" value="(.*?)"',resOrderDetails.text)[0]
-# feeDepId="103"
 feeDepId = re.findall('name="calcDepId" value="(.*?)"',resOrderDetails.text)[0]
-# productName="雪莲果"
 productName = re.findall('name="productName" value="(.*?)"',resOrderDetails.text)[0]
-# productId="14158"
 productId=re.findall('id="productId" value="(.*?)"',resOrderDetails.text)[0]
-# grossWeightDate=created
 grossWeightDate=re.findall('name="grossWeightDate" value="(.*?)"',resOrderDetails.text)[0]
-# tareWeightDate=created
 tareWeightDate = re.findall('name="tareWeightDate" value="(.*?)"',resOrderDetails.text)[0]
-# weight=newWeight
 weight = re.findall('name="weight" readonly value="(.*?)"',resOrderDetails.text)[0]
 calcDepId=re.findall('name="calcDepId" value="(.*?)"',resOrderDetails.text)[0]
 categoryName="水果"
 categoryId="14436"
-# inGreeterName="通用测试"
 inGreeterName = re.findall('id="inGreeterName" value="(.*?)"',resOrderDetails.text)[0]
-# inGreeterId="274"
 inGreeterId = re.findall('name="inGreeterId" id="inGreeterId" value="(.*?)"',resOrderDetails.text)[0]
@@ -371,7 +528,6 @@ for tag in soup.findAll(&quot;div&quot;, class_=&quot;d-flex align-items-center&quot;):
     c = tag.findAll("input")
     for i in c:
         print(i)
-        # print(i.get("name"))
         if i.get("name") != None:
             fee_str = fee_str + "&" + i.get("name") + "=" + urllib.parse.quote(i.get("value"))
             if i.get("type") == "text":
@@ -422,4 +578,5 @@ aa = do_doPay(host=host,autocompletecartype=autocompletecartype,fee_str=fee_str,
               categoryId=carTypeId,grossWeightDate=grossWeightDate,tareWeightDate=tareWeightDate,sumPrice=sumPrice,
               chargeTotalAmountYuan=chargeTotalAmountYuan)
-print(aa.text)
 \ No newline at end of file
+print(aa.text)
+"""
 \ No newline at end of file
@@ -86,7 +86,7 @@ def get_dep(host=&quot;&quot;,**kwargs):
     data = {"keyword":""}
     headers = dct.jsonCode()
     data = dict(data, **kwargs)
-    res = my.useHeadersRequests(method="get", url=url, data=json.dumps(data), headers=headers)
+    res = my.useHeadersRequests(method="get", url=url, params=data, headers=headers)
     return res
-[2021-08-06 15:48:12] [INFO] : ======================================================================================
-[2021-08-06 15:48:12] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': 'sy_chen', 'password': 'VTOTPkEIxvmtuO8zWAmUxzEJRCclqyDB4PzmKnOTpX86q20urQX6IRUZPGHh4g5JDryMvrFYBWufCB9kTnOzHmN1rHx5CIpV8yR6bX0+lQAk2hFlPcZbsWoDgK31CsPr4epTirwTf3WX1lhpMh45oZCYWgaR9PctTb4vAbVJ4m0='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+[2021-08-06 17:59:01] [INFO] : ======================================================================================
+[2021-08-06 17:59:01] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': 'sy_chen', 'password': 'lsWZHfMAgFdA1giqEGJYul8opwYuR43hQpevsvVb43uipM2lnt6JdkBKNUOQqglnozlTCnVQGSo1jClpGUlPrf5vZRqa0pGL+bkt7JeXJEn+PWX6YwcReS35AZjjVMkvte914ZiwNkOhgMS6S/mQeJc6fjJX34NkbMG2yE2jK6w='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
-[2021-08-06 15:48:13] [INFO] : ======================================================================================
-[2021-08-06 15:48:13] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': 'sygangda', 'password': 'kflO1Y7sTjw7YW/y91OMEKKuxKDQCZHNpvL6CUTRMcYg5AJkoN+B1OJW6z5K2vHDeNiJC0+cEnZYcPYsBmFxWgVIiUjf/XAWhd2dsh1HcOQ/HK65PmUFPVOAWlMqFnmkPCgBpd8OYMYUHn6/gHqpyh+MUDi++TSDQcswcgKbY8E='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+[2021-08-06 17:59:01] [INFO] : ======================================================================================
+[2021-08-06 17:59:01] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': 'sygangda', 'password': 'NDKNIWWSXVpWHh9IK/ZgUt60b1DTN6k3jNED6lGBp3Hreemne5supQ8BeLwwxSoRxxt/Ko1Ejg2tLAOBpcsU7yxIvdEBDnuCof8d3OSmsCP83tMGnu/qIe94hIpfz6Pmo5dCQmXK3R83xhFE4FxVhQhL2z1j+QR6iBUWSXnAizU='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
-[2021-08-06 15:48:13] [INFO] : ======================================================================================
-[2021-08-06 15:48:13] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
-{'rows': '10', 'page': '1', 'sort': 'et.created', 'order': 'desc', 'metadata[created]': '{"provider": "datetimeProvider", "index": 10, "field": "created"}', 'metadata[totalPrice]': '{"provider": "moneyProvider", "index": 20, "field": "totalPrice"}', 'metadata[paymentTime]': '{"provider": "datetimeProvider", "index": 30, "field": "paymentTime"}', 'metadata[type]': '{"provider": "entranceFeeBillTypeProvider", "index": 40, "field": "type"}', 'metadata[status]': '{"provider": "entranceFeeBillStateProvider", "index": 50, "field": "status"}', 'attr': 'number', 'attrValue': '202108060900019'}
+[2021-08-06 17:59:01] [INFO] : ======================================================================================
+[2021-08-06 17:59:01] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
+{"businessCode": "jmsf"}
 {}
-[2021-08-06 15:48:13] [INFO] : ======================================================================================
-[2021-08-06 15:48:13] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/3745.action
-None
+[2021-08-06 17:59:02] [INFO] : ======================================================================================
+[2021-08-06 17:59:02] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
+{"marketId": 9, "state": 1, "keyword": "\u852c\u83dc"}
 {}
-[2021-08-06 15:48:15] [INFO] : ======================================================================================
-[2021-08-06 15:48:15] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810032426
-None
+[2021-08-06 17:59:02] [INFO] : ======================================================================================
+[2021-08-06 17:59:02] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
+{"firmCode": "sy", "departmentId": 58, "keyword": ""}
 {}
-[2021-08-06 15:48:20] [INFO] : ======================================================================================
-[2021-08-06 15:48:20] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
+[2021-08-06 17:59:02] [INFO] : ======================================================================================
+[2021-08-06 17:59:02] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
+{"pageNum": 100, "pageSize": 100, "marketId": 9}
+{}
+
+[2021-08-06 17:59:02] [INFO] : ======================================================================================
+[2021-08-06 17:59:02] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
 None
+{'params': {'pid': 'goods_tag'}}
+
+[2021-08-06 17:59:03] [INFO] : ======================================================================================
+[2021-08-06 17:59:03] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
+{"province": "C", "city": null, "area": null}
 {}
-[2021-08-06 15:48:20] [INFO] : ======================================================================================
-[2021-08-06 15:48:20] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
-{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 3745, 'goodsId': '3759', 'number': '202108060900019', 'modified': '2021-08-06 15:48:20', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'accountId': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川B00001', 'autocomplete-cartype': '003(板车)', 'carTypeName': '板车', 'carTypeCode': '003', 'carTypeId': '53', 'carTypeWeight': '333', 'storeTareWeight': '', 'proveType': '1621', 'grossWeight': '353', 'tareWeight': '333', 'weight': '20', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '接车部', 'calcDepId': '103', 'regionName': '', 'regionId': '0', 'productName': '雪莲果', 'productId': '14158', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '71', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-06 15:47:54', 'remark': 'false', 'goodsTagIds': '1900', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '水果', 'categoryId': '14436', 'driverTel': '', 'grossWeightDate': '2021-08-06 15:47:54', 'tareWeightDate': '2021-08-06 15:47:54', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '通用测试', 'inGreeterId': '274', 'outGreeterId': '', 'sumPrice': '2000', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': ''}
+[2021-08-06 17:59:03] [INFO] : ======================================================================================
+[2021-08-06 17:59:03] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
+None
+{'params': {'keyword': ''}}
+
+[2021-08-06 17:59:03] [INFO] : ======================================================================================
+[2021-08-06 17:59:03] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
+None
+{'params': {'pid': 'prove_type'}}
+
+[2021-08-06 17:59:04] [INFO] : ======================================================================================
+[2021-08-06 17:59:04] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
+None
 {}
-[2021-08-06 15:48:21] [INFO] : ======================================================================================
-[2021-08-06 15:48:21] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action
-protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=3745&goodsId=3759&number=202108060900019&modified=2021-08-06%2015%3A47%3A54&status=2&source=1&updateFeeItems=&correctDiscount=1&totalAmount=800&customerId=389&fundAccount=105847&ic=888810032426&customerName=%E9%95%BF%E6%AD%8C%E4%B9%B0%E5%AE%B6%E7%9C%81%E5%86%85%E5%95%8A%E5%95%8A%E5%95%8A%E5%98%BF&customerPhone=18011501258&payway=%E5%88%B7%E5%8D%A1&plate=%E5%B7%9DB00001&autocomplete-cartype=003%28%E6%9D%BF%E8%BD%A6%29&carTypeName=%E6%9D%BF%E8%BD%A6&carTypeCode=003&carTypeId=53&carTypeWeight=333&storeTareWeight=&proveType=1621&grossWeight=353&tareWeight=333&weight=20&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=%E6%8E%A5%E8%BD%A6%E9%83%A8&calcDepId=103&dep=103&regionName=A1%E5%8C%BA&regionId=72&productName=%E9%9B%AA%E8%8E%B2%E6%9E%9C&productId=14158&productArea=%E9%87%8D%E5%BA%86%2C%E9%87%8D%E5%BA%86%E5%B8%82%2C%E4%B8%87%E5%B7%9E%E5%8C%BA&parentId=&levelType=&originId=500101&tradeTypeId=71&chargeTotalAmount=800&chargeTotalAmountYuan=8&freezeMoneySymbol=13&comparisonFreezeAmount=13&created=2021-08-06%2015%3A47%3A54&remark=&goodsTagIds=1900&marketFlag=sy&totalMoney=800&receivable=1300&collectionPrice=0&discountAmount=500&handReceivableAmount=0&itemReceivableAmount=1300&shareRatio=0&handlingTeam=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&receivableAmount=1300&categoryName=%E6%B0%B4%E6%9E%9C&categoryId=53&driverTel=&grossWeightDate=2021-08-06%2015%3A47%3A54&tareWeightDate=2021-08-06%2015%3A47%3A54&grossPathName=&grossPathId=&tarePathId=&goodsRemark=&inGreeterName=&inGreeterId=0&outGreeterId=&sumPrice=2000&shipperName=&shipperId=&shipperPhone=&feeDepName=&calcFeeDepId=&feeDepId=&accountId=105847&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=103&103=10.00&billItems=%7B%22discount%22%3A500%2C%22id%22%3A103%2C%22name%22%3A%22%E4%BA%A4%E6%98%93%E7%AE%A1%E7%90%86%E8%B4%B9%22%2C%22receivable%22%3A1000%2C%22require%22%3A1%7D&billItemDicCheckIds=105&billItemsDic=%7B%22discount%22%3A0%2C%22id%22%3A105%2C%22name%22%3A%22%E4%BC%98%E6%83%A0%E6%94%B6%E8%B4%B9%22%2C%22receivable%22%3A500%2C%22require%22%3A0%7D&billItemCheckIds=106&106=3.00&billItems=%7B%22discount%22%3A0%2C%22id%22%3A106%2C%22name%22%3A%22%E6%A3%80%E6%B5%8B%E8%B4%B9%22%2C%22receivable%22%3A300%2C%22require%22%3A1%7D
+[2021-08-06 17:59:04] [INFO] : ======================================================================================
+[2021-08-06 17:59:04] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
+{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddA12323", "inGreeterId": 223, "inGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "productId": 14152, "productName": "\u852c\u83dc", "proveTypeCode": 665, "proveTypeName": "\u98df\u54c1\u5b89\u5168", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 401, "grossWeightDate": "2021-08-06 17:59:04", "newWeight": 68, "tareWeight": 333, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddA12323", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 58, "depName": "\u6c34\u679c\u90e8", "cateId": 14152, "notice": 0, "backSkinTwo": -1, "recordOriginId": 0, "recordOriginName": null, "recordProductId": 0, "recordProductName": null, "recordWeight": null, "codeIc": null, "codeId": 0, "difference": 0, "bindRecordSign": 0, "recordDesc": null, "hasCodeItems": false, "customerId": 0, "customerName": "", "driverIc": null, "driverName": null, "totalPrice": null, "originId": 500101, "origin": "\u4e07\u5dde\u533a", "originCode": "023", "tradeType": "9001", "tradeTypeName": "\u6c88\u96331\u53f7", "weight": 2.0, "pwd": "", "type": 1, "ic": "", "boothNumber": "210728154359", "productState": "1", "accountId": 0, "passCheckId": 0, "passCheckName": null, "tradeTypeId": 70, "id": 0, "protocolId": null, "goodsTagId": 663}
 {}
@@ -4,6 +4,7 @@ from commons.MySession import my,sy1
 from commons.api.feedback_order_settlement import feedback_order_settlement
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 from commons.api.feedback_order_settlement_query import feedback_order_settlement_query
+import random
 fosq = feedback_order_settlement_query()
 fos = feedback_order_settlement()
@@ -17,24 +18,28 @@ class test_feedback_order_settlement(unittest.TestCase):
     def setUp(self):
         body = fosq.body.replace("feedbackCustomerId=25", "feedbackCustomerId=16").replace("2021-07-22 00:00:00", "\
             2021-07-03 00:00:00").replace("2021-08-03 23:59:59","2021-08-03 23:59:59")
-        re = sy1.post(url=fosq.url, data=body, headers=fosq.header, proxies=my.myproxies)
-        Amount = re.json()["rows"][0]["unsettledAmount"]
-        ids = re.json()["rows"][0]["id"]
-        billIds = re.json()["rows"][0]["billId"]
-        return Amount, ids, billIds
+        re = sy1.post(url=fosq.url, data=body, headers=fosq.header)
+        # self.id = re.json()["rows"][0]["id"]
+        self.Amount = re.json()["rows"][0]["unsettledAmount"]
+        self.ids = re.json()["rows"][0]["id"]
+        self.billIds = re.json()["rows"][0]["billId"]
+        #
+        # elf.name = re.json()["rows"][0]["name"]
+
     def test_feedback_order_settlement_01(self):
-        body = fos.body.replace("id=25","id=25").replace("888810057654","888810057654").replace("settleAmount=2","settleAmount=2").\
-            replace("ids=12034","ids=11953").\
+        body = fos.body.replace("id=25","id=25").replace("888810057654","888810057654")\
+            .replace("settleAmount=2","settleAmount="+str(self.Amount)).\
+            replace("ids=12034","ids="+str(self.ids)).\
             replace("feedbackCustomerId=25","feedbackCustomerId=25").\
             replace("feedbackCustomerName=验证员工推送到CRM","feedbackCustomerName=验证员工推送到CRM").\
-            replace("billIds=3621","billIds=3493").\
-            replace("settledAmounts=2","settledAmounts=2")
-
+            replace("billIds=3621","billIds="+str(self.billIds)).\
+            replace("settledAmounts=2","settledAmounts="+str(self.Amount))
+        print(body)
         re = sy1.post(url = fos.url, headers = fos.header, data = body.encode('utf-8'))
-        # print(re.headers)
+        print(re.headers)
-        # print(re.json())
+        print(re.json())
         self.assertTrue("操作成功" in str(re.json()))
         return re
@@ -10,12 +10,13 @@ class test_feedbackAccounrecordController_list(unittest.TestCase):
     "交易明细——交易流水号查询"
     @classmethod
     def setUpClass(cls):
+        print(sy1.user["sy_user01"]["firmId"])
         pass
     def setUp(self):
         self.body = db.mysql_selectOne(
             '''SELECT dili_jmsf.feedback_account_record.created,dili_jmsf.feedback_order.record_number 
 FROM `dili_jmsf`.`feedback_order` LEFT JOIN `dili_jmsf`.`feedback_account_record` ON dili_jmsf.feedback_order.id = dili_jmsf.feedback_account_record.order_ids 
-ORDER BY dili_jmsf.feedback_account_record.order_ids DESC  LIMIT 1''')
+WHERE market_id = '''+str(sy1.user["sy_user01"]["firmId"])+''' ORDER BY dili_jmsf.feedback_account_record.order_ids DESC  LIMIT 1''')
         print("查询出查询时间和交易流水号:", self.body[0],self.body[1])
     def test_feedbackAccounrecordController_list_01(self):
@@ -8,11 +8,4 @@
 """
 """
-import json
-import urllib
-import urllib.parse
-a = {"a":"b","c":"阿三大苏打"}
-print(urllib.parse.urlencode(a))
-b = "a=b&c=d"
-# print(urllib.unquote)
@@ -13,6 +13,7 @@ import json
 import unittest
 from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
+from commons.api import entranceFeeBillList as eFBL
 import time,random
 class test_demo(unittest.TestCase):
@@ -33,9 +34,14 @@ class test_demo(unittest.TestCase):
     def tearDownClass(cls) -> None:
         pass
-    @unittest.skip
+    # @unittest.skip
     def test_get_carType(self):
         """整车-整车创建:获取车型接口调用测试"""
+        # 依赖数据
+        plate = "川A12323"
+        productState = "1"
+        trailerNumber = plate
+
         # 获取车型
         carType = zcA.get_carType(host=self.gatewayHost)
         print(carType.text)
@@ -53,7 +59,7 @@ class test_demo(unittest.TestCase):
         productName = categoryByCondition.json()["data"][0]["name"]
         productCode = categoryByCondition.json()["data"][0]["keycode"]
-        # 获取商品
+        # 获取接车员
         listByExample = zcA.get_listByExample(host=self.gatewayHost)
         print(listByExample.json())
         inGreeterId = listByExample.json()["data"][0]["id"]
@@ -95,11 +101,6 @@ class test_demo(unittest.TestCase):
         print(duplicateTokenRes.json())
         duplicateToken = duplicateTokenRes.json()["data"]
-        # 创建生成进门单
-        plate = "川A12323"
-        productState = "1"
-        trailerNumber = plate
-
         # 重量信息准备
         grossWeight = random.randint(carTypeWeight,carTypeWeight+100)
         tareWeight = carTypeWeight
@@ -126,6 +127,8 @@ class test_demo(unittest.TestCase):
                                   userName="ty_test",transactionName="沈阳2号",newWeight=20,
                                   depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜")
         print(cre_res.json())
+        number = cre_res.json()["data"]["number"]
+        aa = eFBL.do_payOrder(attrValue=number)
         # cre_res = zcA.create_jmsf(host=self.gatewayHost,plate="川B00002",newWeight=20)
         # print(cre_res.json())
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/8/6 16:29
+# @Author  : Ljq
+# @File    : test_ZCBasic.py
+# @Software: PyCharm
+
+"""
+整车进门基础数据获取测试
+"""
+
+import json
+import unittest
+from commons.scripts.readConf import rC
+from commons.api import zcApi as zcA
+from commons.MySession import my
+from commons.api import entranceFeeBillList as eFBL
+import time,random
+
+class test_ZCBasic(unittest.TestCase):
+    """整车-创建整车进门单基础信息接口测试"""
+    def setUp(self) -> None:
+        pass
+
+    def tearDown(self) -> None:
+        pass
+
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
+        cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        pass
+
+    def test_getCar(self):
+        """整车-整车创建:获取车型接口调用测试"""
+        # 获取车型
+        carType = zcA.get_carType(host=self.gatewayHost)
+        print(carType.text)
+        assert carType.json()["code"] == "200"
+        assert carType.json()["data"] != []
+
+    def test_getAllCategory(self):
+        """整车-整车创建:获取测试商品信息测试"""
+        # 获取
+        # print(my.userInfo["data"]["user"]["firmCode"])
+        marketId = my.userInfo["data"]["user"]["firmId"]
+        resCategory = zcA.get_listCategoryByCondition(host=self.gatewayHost,marketId=marketId,keyword="")
+        print(resCategory.text)
+        assert resCategory.json()["code"] == "200","全商品查询失败"
+        assert resCategory.json()["data"] != [],"全商品查询失败，查询结果不应该为空"
+
+    def test_getOneCategory(self):
+        """整车-整车创建:获取测试商品信息测试"""
+        # 获取
+        marketId = my.userInfo["data"]["user"]["firmId"]
+        resCategory = zcA.get_listCategoryByCondition(host=self.gatewayHost,marketId=marketId,keyword="火龙果")
+        print(resCategory.text)
+        nameList = [i["name"] for i in resCategory.json()["data"]]
+        assert resCategory.json()["code"] == "200"
+        for i in nameList:
+            assert "火龙果" in i,"指定条件查询失败，按照名称查询出商品错误"
+
+    def test_getAllExample(self):
+        """整车-整车创建:接车员信息获取测试"""
+        # print(my.userInfo["data"]["user"]["departmentId"])
+        firmCode = my.userInfo["data"]["user"]["firmCode"]
+        departmentId = my.userInfo["data"]["user"]["departmentId"]
+        listByExample = zcA.get_listByExample(host=self.gatewayHost,firmCode=firmCode,departmentId=departmentId)
+        print(listByExample.json())
+        assert listByExample.json()["code"]=="200","接车员信息获取测试失败"
+        assert listByExample.json()["data"]!=[],"接车员信息获取测试失败"
+
+    def test_getOneExample(self):
+        """整车-整车创建:按接车员名称信息查询接车员"""
+        # print(my.userInfo["data"]["user"]["departmentId"])
+        firmCode = my.userInfo["data"]["user"]["firmCode"]
+        departmentId = my.userInfo["data"]["user"]["departmentId"]
+        keyword="测试"
+        listByExample = zcA.get_listByExample(host=self.gatewayHost,firmCode=firmCode,departmentId=departmentId,
+                                              keyword=keyword)
+        print(listByExample.json())
+        assert listByExample.json()["code"]=="200","按接车员名称信息查询接车员测试失败"
+        assert listByExample.json()["data"]!=[],"按接车员名称信息查询接车员测试失败"
+
+    def test_transactionType(self):
+        """整车-整车创建:交易类型获取测试"""
+        transactionType = zcA.query_transactionType(host=self.gatewayHost)
+        print(transactionType.json())
+        assert transactionType.status_code==200,"交易类型信息获取测试失败"
+        assert transactionType.json()["rows"]!=[],"交易类型信息获取测试失败"
+
+    def test_getGoodsTag(self):
+        """整车-整车创建:货物标签获取测试"""
+        goodsTag = zcA.get_goodsTag(host=self.gatewayHost)
+        print(goodsTag.json())
+        assert goodsTag.status_code==200,"货物标签信息获取测试失败"
+        assert goodsTag.json()["data"]!=[],"货物标签信息获取测试失败"
+
+    def test_getAllAddress(self):
+        """整车-整车创建:按照省份查询产地"""
+        province = "四川省"
+        address = zcA.get_address(host=self.gatewayHost,province=province)
+        print(address.json())
+        assert address.json()["code"] == "200","按照省份查询产地信息获取测试失败"
+        mergerNameList = [i["mergerName"] for i in address.json()["data"] if province not in i["mergerName"]]
+        assert mergerNameList == [],"按照省份查询产地信息获取测试失败"
+
+    def test_getOneAddress(self):
+        """整车-整车创建:按照省份查询产地"""
+        province = "四川省"
+        city = "成都市"
+        area = "锦江区"
+        address = zcA.get_address(host=self.gatewayHost,province=province,city=city,area=area)
+        print(address.json())
+        assert address.json()["code"]=="200","详细产地信息查询失败"
+        assert len(address.json()["data"])==1,"详细产地信息查询只能查询出一个结果，查询结果超过一个测试失败"
+        assert address.json()["data"][0]["mergerName"] == "四川省,成都市,锦江区","根据省市区查询插地信息查询失败"
+
+    def test_getAllDep(self):
+        """整车-整车创建:接车部门信息获取"""
+        depRes = zcA.get_dep(host=self.gatewayHost)
+        print(depRes.json())
+        assert depRes.json()["code"]=="200","接车部门信息获取测试失败"
+        assert depRes.json()["data"] != [], "接车部门信息获取测试失败"
+
+
+    def test_getOneDep(self):
+        """整车-整车创建:查询指定接车部门信息"""
+        keyword="水果部"
+        depRes = zcA.get_dep(host=self.gatewayHost,keyword=keyword)
+        print(depRes.json())
+        assert depRes.json()["code"]=="200","查询指定接车部门信息获取测试失败"
+        assert len(depRes.json()["data"]) == 1, "查询指定接车部门信息获取测试失败"
+        assert depRes.json()["data"][0]["name"] == keyword,"查询指定接车部门信息获取测试失败"
+
+    def test_getProveType(self):
+        """整车-整车创建:证明类型信息获取"""
+        proveType = zcA.get_proveType(host=self.gatewayHost)
+        print(proveType.json())
+        assert proveType.json()["code"]=="200","证明类型信息获取测试失败"
+        assert proveType.json()["data"] != [], "证明类型信息获取测试失败"
+
+    def test_getDuplicateToken(self):
+        """整车-整车创建:获取防重复token"""
+        duplicateTokenRes = zcA.get_duplicateToken(host=self.gatewayHost)
+        print(duplicateTokenRes.json())
+        assert duplicateTokenRes.json()["code"]=="200","获取防重复token测试失败"
+        assert duplicateTokenRes.json()["data"].isalnum(), "获取防重复token测试失败"
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/8/6 17:49
+# @Author  : Ljq
+# @File    : test_ZCCreate.py
+# @Software: PyCharm
+
+"""
+整车进门但创建测试
+"""
+
+import json
+import unittest
+from commons.scripts.readConf import rC
+from commons.api import zcApi as zcA
+from commons.api import entranceFeeBillList as eFBL
+import time,random
+
+class test_ZCCreate(unittest.TestCase):
+    """整车-创建整车进门单"""
+    def setUp(self) -> None:
+        pass
+
+    def tearDown(self) -> None:
+        pass
+
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
+        cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        pass
+
+    def test_creZC(self):
+        """整车-整车创建:按接车员名称信息查询接车员"""
+        """整车-整车创建:获取车型接口调用测试"""
+        # 依赖数据
+        plate = "川A12323"
+        productState = "1"
+        trailerNumber = plate
+
+        # 获取车型
+        carType = zcA.get_carType(host=self.gatewayHost)
+        print(carType.text)
+        print(carType.json()["data"][0])
+        carTypeCode = carType.json()["data"][0]["code"]
+        carTypeId = carType.json()["data"][0]["id"]
+        carTypeName = carType.json()["data"][0]["carTypeName"]
+        carTypeWeight = carType.json()["data"][0]["weight"]
+
+        # 获取商品
+        categoryByCondition = zcA.get_listCategoryByCondition(host=self.gatewayHost)
+        print(categoryByCondition.json())
+        cateId = categoryByCondition.json()["data"][0]["id"]
+        productId = categoryByCondition.json()["data"][0]["id"]
+        productName = categoryByCondition.json()["data"][0]["name"]
+        productCode = categoryByCondition.json()["data"][0]["keycode"]
+
+        # 获取接车员
+        listByExample = zcA.get_listByExample(host=self.gatewayHost)
+        print(listByExample.json())
+        inGreeterId = listByExample.json()["data"][0]["id"]
+        inGreeterName = listByExample.json()["data"][0]["realName"]
+
+        # 获取交易类型
+        transactionType = zcA.query_transactionType(host=self.gatewayHost)
+        print(transactionType.json())
+        tradeType = transactionType.json()["rows"][0]["code"]
+        tradeTypeId = transactionType.json()["rows"][0]["id"]
+        tradeTypeName = transactionType.json()["rows"][0]["name"]
+
+        # 获取货物标签
+        goodsTag = zcA.get_goodsTag(host=self.gatewayHost)
+        print(goodsTag.json())
+        goodsTagId = goodsTag.json()["data"][0]["id"]
+
+        # 产地信息获取
+        address = zcA.get_address(host=self.gatewayHost)
+        print(address.json())
+        originId = address.json()["data"][0]["id"]
+        origin = address.json()["data"][0]["name"]
+        originCode = address.json()["data"][0]["cityCode"]
+
+        # 查询部门信息
+        depRes = zcA.get_dep(host=self.gatewayHost)
+        print(depRes.json())
+        feeDepId = depRes.json()["data"][0]["id"]
+        feeDepName = depRes.json()["data"][0]["name"]
+
+        # 获取证明类型
+        proveType = zcA.get_proveType(host=self.gatewayHost)
+        print(proveType.json())
+        proveTypeCode = proveType.json()["data"][0]["id"]
+        proveTypeName = proveType.json()["data"][0]["name"]
+
+        # 获取防重token
+        duplicateTokenRes = zcA.get_duplicateToken(host=self.gatewayHost)
+        print(duplicateTokenRes.json())
+        duplicateToken = duplicateTokenRes.json()["data"]
+
+        # 重量信息准备
+        grossWeight = random.randint(carTypeWeight, carTypeWeight + 100)
+        tareWeight = carTypeWeight
+        weighmanRecord = {"grossWeight": None, "grossWeightDate": "", "newWeight": None, "tareWeight": None,
+                          "tareWeightDate": None, "weighImgs": []}
+        weighmanRecord["grossWeight"] = grossWeight
+        weighmanRecord["tareWeight"] = carTypeWeight
+        weighmanRecord["newWeight"] = grossWeight - carTypeWeight
+        weighmanRecord["grossWeightDate"] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+
+        # 创建进门单
+        cre_res = zcA.create_wholeCarWeighSave(host=self.gatewayHost, duplicateToken=duplicateToken,
+                                               carTypeCode=carTypeCode, carTypeId=carTypeId,
+                                               carTypeName=carTypeName, carTypeWeight=carTypeWeight, plate=plate,
+                                               productId=productId, productName=productName,
+                                               proveTypeCode=proveTypeCode,
+                                               proveTypeName=proveTypeName, trailerNumber=trailerNumber,
+                                               depName=feeDepName,
+                                               cateId=cateId, originId=originId, origin=origin, originCode=originCode,
+                                               tradeType=tradeType, tradeTypeName=tradeTypeName,
+                                               productState=productState,
+                                               tradeTypeId=tradeTypeId, goodsTagId=goodsTagId, inGreeterId=inGreeterId,
+                                               inGreeterName=inGreeterName, dep=feeDepId, weighmanRecord=weighmanRecord)
+        print(cre_res.json())
 \ No newline at end of file