Verify that you have JavaScript enabled in your browser.
+
Make sure you are using a modern enough browser. If using Internet Explorer, version 11 is required.
+
Check are there messages in your browser's JavaScript error log. Please report the problem if you suspect you have encountered a bug.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/000-Regularorder/1-Client(Test)/output.xml b/000-Regularorder/1-Client(Test)/output.xml
new file mode 100644
index 0000000..f0ff275
--- /dev/null
+++ b/000-Regularorder/1-Client(Test)/output.xml
@@ -0,0 +1,335 @@
+
+
+
+
+
+ZTBT
+${url}
+${headers}
+Create Session: create a HTTP session to a server
+Variable '${headers}' not found.
+
+
+
+${repsponse}
+ZTBT
+recycle-service/proxy-sell-activity/list
+params=pageNum=1&pageSize=15
+Sends a GET request on a previously created HTTP Session.
+
+
+
+${records}
+${repsponse.json()["data"]}
+records
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+${item}
+@{records}
+
+${item}
+
+${activityName}
+${item}
+activityName
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+${paperCategoryList}
+${item}
+paperCategoryList
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+${paperMillId}
+${item}
+paperMillId
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+${activityId}
+${item}
+activityId
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+'${activityName}'=='无账期活动一次'
+Stops executing the enclosing for loop if the ``condition`` is true.
+
+
+
+
+
+
+
+${Category_value}
+random.choice(${paperCategoryList})
+random
+Evaluates the given expression in Python and returns the result.
+
+
+
+\nvalue: ${Category_value}
+Logs the given message to the console.
+
+
+
+${categoryId}
+${Category_value}
+categoryId
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+${categoryName}
+${Category_value}
+categoryName
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+${unitPrice}
+${Category_value}
+unitPrice
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+${paperMillId}
+Makes a variable available globally in all tests and suites.
+
+
+
+${activityId}
+Makes a variable available globally in all tests and suites.
+
+
+
+${categoryId}
+Makes a variable available globally in all tests and suites.
+
+
+
+${categoryName}
+Makes a variable available globally in all tests and suites.
+
+
+
+${unitPrice}
+Makes a variable available globally in all tests and suites.
+
+
+Variable '${headers}' not found.
+
+
+
+get-carinfo
+${url}
+${headers}
+Create Session: create a HTTP session to a server
+Variable '${headers}' not found.
+
+
+
+${reps}
+get-carinfo
+recycle-service/proxy-sell/get/his-car-info
+Sends a GET request on a previously created HTTP Session.
+
+
+
+${reps.json()}
+Logs the given message with the given level.
+
+
+
+${carNumber}
+${reps.json()["data"]}
+records
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+${plateNumber_value}
+random.sample(${carNumber},1)
+random
+Evaluates the given expression in Python and returns the result.
+
+
+
+\nvalue:${plateNumber_value}
+Logs the given message to the console.
+
+
+
+${plateNumber1}
+${plateNumber_value[0]}
+plateNumber
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+${plateNumber1}
+Makes a variable available globally in all tests and suites.
+
+
+Variable '${headers}' not found.
+
+
+
+ZTBT
+${url}
+${headers}
+Create Session: create a HTTP session to a server
+Variable '${headers}' not found.
+
+
+
+${reps}
+ZTBT
+recycle-service/get/paper-mill-paper-category-price-details/${paperMillId}
+Sends a GET request on a previously created HTTP Session.
+
+
+
+${reps.json()}
+Logs the given message with the given level.
+
+
+Variable '${headers}' not found.
+
+
+
+ZTBT
+${url}
+${headers}
+Create Session: create a HTTP session to a server
+Variable '${headers}' not found.
+
+
+
+${reps}
+ZTBT
+recycle-service/proxy-sell/get/relation
+Sends a GET request on a previously created HTTP Session.
+
+
+
+${bizUserId}
+${reps.json()["data"]}
+bizUserId
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+${cusormerId}
+${reps.json()["data"]}
+cusormerId
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+${customerName}
+${reps.json()["data"]}
+customerName
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+${bizUserId}
+Makes a variable available globally in all tests and suites.
+
+
+
+${cusormerId}
+Makes a variable available globally in all tests and suites.
+
+
+
+${customerName}
+Makes a variable available globally in all tests and suites.
+
+
+Variable '${headers}' not found.
+
+
+
+ZTBT
+${url}
+${headers}
+Create Session: create a HTTP session to a server
+Variable '${headers}' not found.
+
+
+
+${datatime}
+result_format=%Y-%m-%d
+Returns current local or UTC time with an optional increment.
+
+
+
+${order_data}
+{ \ \ \ \ "paperCategoryId":"${categoryId}", \ \ \ \ "unitPrice":"${unitPrice}", \ \ \ \ "totalEstimatedWeight":30000, \ \ \ \ "activityId":"${activityId}", \ \ \ \ "customerName":"${customerName}", \ \ \ \ "deliveryTime":"${datatime}", \ \ \ \ "carInfos":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "plateNumber":"${plateNumber1}" \ \ \ \ \ \ \ \ } \ \ \ \ ] }
+Returns the given values which can then be assigned to a variables.
+
+
+
+${reps}
+ZTBT
+recycle-service/proxy-sell/create/order
+${order_data.encode('utf-8')}
+Sends a POST request on a previously created HTTP Session.
+
+
+
+${reps.json()}
+Logs the given message with the given level.
+
+
+
+${orderId}
+${reps.json()["data"]}
+orderId
+Returns a value from the given ``dictionary`` based on the given ``key``.
+
+
+
+${reps.json()["message"]}
+successful
+Fails if objects are unequal after converting them to strings.
+
+
+
+${orderId}
+Makes a variable available globally in all tests and suites.
+
+
+
+${datatime}
+Makes a variable available globally in all tests and suites.
+
+
+Variable '${headers}' not found.
+
+
+
+
+
+All Tests
+
+
+
+
+2.2createActiveorder-1
+
+
+
+Error in file '/root/ztb-trading-rf-api/ztb-trading-rf-api/1-Client(Test)/2.2createActiveorder-1.robot' on line 8: Setting variable '${headers}' failed: Variable '${gettoken}' not found.
+
+
diff --git a/000-Regularorder/1-Client(Test)/report.html b/000-Regularorder/1-Client(Test)/report.html
new file mode 100644
index 0000000..cf9d1a3
--- /dev/null
+++ b/000-Regularorder/1-Client(Test)/report.html
@@ -0,0 +1,2461 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Opening Robot Framework report failed
+
+
Verify that you have JavaScript enabled in your browser.
+
Make sure you are using a modern enough browser. If using Internet Explorer, version 11 is required.
+
Check are there messages in your browser's JavaScript error log. Please report the problem if you suspect you have encountered a bug.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/000-Regularorder/2-Background_system(Test)/1-WebLogin/weblogin.robot b/000-Regularorder/2-Background_system(Test)/1-WebLogin/weblogin.robot
new file mode 100644
index 0000000..f08ffc4
--- /dev/null
+++ b/000-Regularorder/2-Background_system(Test)/1-WebLogin/weblogin.robot
@@ -0,0 +1,21 @@
+*** Settings ***
+Library RequestsLibrary
+
+*** Test Cases ***
+pwlogin
+ ${header} Create Dictionary Content-Type=application/x-www-form-urlencoded X-APP-ID=470236309865238555
+ Create Session ZTBT http://api-ops-ztb-test.qniao.cn ${header}
+ &{data} Create Dictionary username=laiyonglan@qniao.cn password=qn123456
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/login data=${data}
+ log ${reps.json()}
+ ${gettoken} Set Variable Token 6b08add42d6bcf73abb935b2adf83525
+ Should Be Equal As Strings ${reps.json()["message"]} 登陆成功
+ Set Global Variable ${gettoken}
+
+login-info
+ ${header} Create Dictionary X-APP-ID=470236309865238555 Authorization=Token 6b08add42d6bcf73abb935b2adf83525
+ Create Session login-info http://api-ops-ztb-test.qniao.cn ${header}
+ ${reps_data} Get On Session login-info recycle-service/admin/employee/get/login-info
+ log ${reps_data}
+ Should Be Equal As Strings ${reps_data.json()["message"]} successful
diff --git a/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/1-appointment.robot b/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/1-appointment.robot
new file mode 100644
index 0000000..60ad6a2
--- /dev/null
+++ b/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/1-appointment.robot
@@ -0,0 +1,57 @@
+*** Settings ***
+Documentation 预约送货
+Library RequestsLibrary
+Library Collections
+Library DateTime
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_paper-mill-order-reservation-list
+ Create Session ZTBT ${URL} ${header}
+ ${reps_data} Get On Session ZTBT recycle-service/admin/customer-service/get/paper-mill-order-reservation-list params=pageNum=1&pageSize=10&status=&orderId=${orderId}
+ log ${reps_data.json()}
+ #获取订单编号${orderId}、纸厂id${paperMillId}、订单类型${orderType}
+ ${orderId} Get From Dictionary ${reps_data.json()["data"]["records"][0]} orderId #订单编号
+ ${paperMillId} Get From Dictionary ${reps_data.json()["data"]["records"][0]} paperMillId #纸厂id
+ ${id} Get From Dictionary ${reps_data.json()["data"]["records"][0]} id #预约id
+ ${orderType} Get From Dictionary ${reps_data.json()["data"]["records"][0]} orderType #订单类型
+ ${carNoList} Get From Dictionary ${reps_data.json()["data"]["records"][0]} carNoList #车辆信息列表
+ ${paperMillName} Get From Dictionary ${reps_data.json()["data"]["records"][0]} paperMillName #纸厂名称
+ ${sellerReservationDate} Get From Dictionary ${reps_data.json()["data"]["records"][0]} sellerReservationDate #送货时间
+ #随机获取车辆信息
+ ${carList} Evaluate random.choice(${carNoList}) random
+ log to console \nvalue:${carList}
+ Should Be Equal As Strings ${reps_data.json()["message"]} successful
+ Set Global Variable ${orderId}
+ Set Global Variable ${paperMillId}
+ Set Global Variable ${id}
+ Set Global Variable ${paperMillName}
+ Set Global Variable ${sellerReservationDate}
+ Set Global Variable ${orderType}
+ Set Global Variable ${carList}
+
+get-supplier
+ Create Session ZTBT http://api-ops-ztb-test.qniao.cn ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/paper-mill-merchant/${paperMillId} params=paperMillId=${paperMillId}
+ log ${reps.json()}
+ #获取供应商id和name
+ ${data} Get From Dictionary ${reps.json()} data
+ ${value} Evaluate random.choice(${data}) random
+ log to console \nvalue: ${value}
+ ${supplier_id} Get From Dictionary ${value} id #供应商id
+ ${millSupplierName} Get From Dictionary ${value} name #供应商名称
+ Set Global Variable ${supplier_id}
+ Set Global Variable ${millSupplierName}
+
+Submit-appointment
+ #${headers} Create Dictionary Content-Type=application/json X-APP-ID=470236309865238555 Authorization=Token 6b08add42d6bcf73abb935b2adf83525
+ #提交预约信息
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} get current date result_format=%Y-%m-%d
+ ${data} Set Variable {"attention":"${orderId}","buyerReservationDate":"${datatime}", "id":"${id}","millDeliveryOrderId":"${orderId}","millSupplierId":"${supplier_id}","millSupplierName":"${millSupplierName}","proxySellerSettleType":0,"scrapeOrderId":"${orderId}"}
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/customer-service/update/reservation ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
diff --git a/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/2.1-RegularUpload-weightnote.robot b/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/2.1-RegularUpload-weightnote.robot
new file mode 100644
index 0000000..05b4007
--- /dev/null
+++ b/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/2.1-RegularUpload-weightnote.robot
@@ -0,0 +1,211 @@
+*** Settings ***
+Documentation 上传磅单-常规
+Test Timeout
+Library Collections
+Library RequestsLibrary
+Library DateTime
+Library requests
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get-order-item-list
+ #查找预约的订单项列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order-item-list params=orderType=${orderType} &pageNum=1&pageSize=10&status=51&orderId=${orderId}
+ log ${reps.json()}
+ ${orderItemId} Get From Dictionary ${reps.json()["data"]["records"][0]} orderItemId #订单项编号
+ ${bizOwnerName} Get From Dictionary ${reps.json()["data"]["records"][0]} bizOwnerName #业务归属人name
+ ${bizOwnerId} Get From Dictionary ${reps.json()["data"]["records"][0]} bizOwnerId #业务归属人id
+ Set Global Variable ${orderItemId}
+ Should Be Equal ${reps.json()["data"]["records"][0]["orderId"]} ${orderId}
+
+get-order-item-details
+ #查看订单列表详情
+ Create Session ZTBT ${URL} ${header}
+ #${data} Set Variable orderId=${orderId} orderItemId=${orderItemId}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #当前订单下单时的合同id
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]} unitSurcharge #代卖费
+ ${proxySellerSettleType} Get From Dictionary ${reps.json()["data"]} proxySellerSettleType #代卖费结算方式
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]} paperCategoryId #纸厂品类ID
+ ${unitPrice} Get From Dictionary ${reps.json()["data"]} paperCategoryPrice #品类单价
+ ${publicSubsidies} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} publicSubsidies #公开补贴
+ ${millSupplierId} Get From Dictionary ${reps.json()["data"]} millSupplierId #纸厂供应商ID
+ ${paperMillSupplierName} Get From Dictionary ${reps.json()["data"]} paperMillSupplierName #纸厂供应商名称
+ ${publicSubsidies} Set Variable If '${publicSubsidies}'=='${null}' 0 ${publicSubsidies}
+ ${settleUtiPrice}= Evaluate ${unitPrice}+${publicSubsidies} #结算单价
+ ${unitSurcharge} Set Variable If '${unitSurcharge}'=='${None}' 0 ${unitSurcharge}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ #${activitySettleType} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} activitySettleType #活动结算方式(0:70%,1:85%,2:全额)
+ log ${contractId}
+ Set Global Variable ${contractId}
+ Set Global Variable ${unitSurcharge}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${settleUtiPrice}
+ Set Global Variable ${unitPrice}
+ Set Global Variable ${publicSubsidies}
+ Set Global Variable ${millSupplierId}
+ Set Global Variable ${paperMillSupplierName}
+ Set Global Variable ${proxySellerSettleType}
+ Set Global Variable ${contractId}
+ #Set Global Variable ${activitySettleType}
+
+get-Transaction subject
+ #获取交易主体
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/transaction-main-enterprise/list
+ ${交易数据} Get From Dictionary ${reps.json()} data
+ #随机获取交易主体
+ ${交易信息} Evaluate random.choice(${交易数据}) random
+ log to console \nvalue:${交易信息}
+ ${交易主体id} Get From Dictionary ${交易信息} id #交易主体id
+ ${交易主体name} Get From Dictionary ${交易信息} name #交易主体name
+ Set Global Variable ${交易主体id}
+ Set Global Variable ${交易主体name}
+
+get-Warehouse
+ #获取所属仓库
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/transaction-main-enterprise/get/warehouse-name
+ ${仓库} Get From Dictionary ${reps.json()} data
+ #随机获取仓库
+ ${所属仓库} Evaluate random.choice(${仓库}) random
+ log to console \nvalue:${所属仓库}
+ Set Global Variable ${所属仓库}
+
+get-Source of funds
+ #获取资金来源
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/fund-source/get/list
+ log ${reps.json()}
+ ${data} Get From Dictionary ${reps.json()} data
+ FOR ${item} IN @{data}
+ log ${item}
+ ${isDefault} Get From Dictionary ${item} isDefault #获取启用状态
+ ${name} Get From Dictionary ${item} name #获取name
+ ${id} Get From Dictionary ${item} id #获取id
+ Exit For Loop If '${isDefault}'=='1'
+ END
+ Set Global Variable ${name}
+ Set Global Variable ${id}
+
+get-contract-list
+ #获取订单纸厂的所有合同信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT /recycle-service/admin/contract/get/selectable-contract-list params=orderItemId=${orderItemId}
+ log ${reps.json()}
+
+get-supplier
+ #获取纸厂供应商
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/paper-mill-merchant/${paperMillId} params=paperMillId=${paperMillId}
+ log ${reps.json()}
+
+get-category price
+ #获取下单品类,上传磅单时的价格
+ Create Session ZTBT ${URL} ${header}
+ ${dataTime} Get Current Date result_format=%Y-%m-%d
+ ${reps} Get On Session ZTBT recycle-service/admin/proxy-sell/get-category-price-by-date params=orderItemId=${orderItemId}&weightDay=${dataTime}
+ log ${reps.json()}
+ ${price} Get From Dictionary ${reps.json()["data"][0]} price #下单品类价格
+ ${publicSubsidies} Get From Dictionary ${reps.json()["data"][0]} publicSubsidies #下单品类公开补贴
+ Set Global Variable ${price}
+ Set Global Variable ${publicSubsidies}
+ Set Global Variable ${dataTime}
+
+get_paper-mill-category
+ #获取当前纸厂的所有纸品品类
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/paperMill/get/paper-mill-category/${paperMillId} params=id=${paperMillId}
+ log ${reps.json()}
+
+get_contract_by_id
+ #获取下单时绑定的合同
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/contract/get/detail-by-id params=id=${contractId}
+ log ${reps.json()}
+ #获取垫资费、企业ID、应收金额结算规则、含税结算单价结算规则
+ ${advanceFund} Get From Dictionary ${reps.json()["data"]} advanceFund #垫资费
+ ${buyerEnterpriseId} Get From Dictionary ${reps.json()["data"]} buyerEnterpriseId #企业id
+ ${settleRules} Get From Dictionary ${reps.json()["data"]} settleRules #应收金额结算规则
+ ${settlePriceIncludeTaxSettleRules} Get From Dictionary ${reps.json()["data"]} settlePriceIncludeTaxSettleRules #含税结算单价结算规则
+ ${taxRefundRate} Get From Dictionary ${reps.json()["data"]} taxRefundRate #税点
+ ${proxyPaySurcharge} Get From Dictionary ${reps.json()["data"]} proxyPaySurcharge #代收费
+ ${hasInvoice} Get From Dictionary ${reps.json()["data"]} hasInvoice #是否开票
+ ${accountPeriodType} Get From Dictionary ${reps.json()["data"]} accountPeriodType #账期类型
+ ${isSubsidyAndDeductIncludeTax} Get From Dictionary ${reps.json()["data"]} isSubsidyAndDeductIncludeTax #纸厂补贴是否含税
+ ${receivableSettlementRules} Get From Dictionary ${reps.json()["data"]} settleRules #应收金额结算规则
+ ${settlePriceIncludeTaxSettleRules} Get From Dictionary ${reps.json()["data"]} settlePriceIncludeTaxSettleRules #含税结算单价结算规则
+ ${advanceFund} Set Variable If '${advanceFund}'=='${None}' 0 ${advanceFund}
+ ${proxyPaySurcharge} Set Variable If '${proxyPaySurcharge}'=='${None}' 0 ${proxyPaySurcharge}
+ ${taxRefundRate} Set Variable If '${taxRefundRate}'=='${None}' 0 ${taxRefundRate}
+ Set Global Variable ${advanceFund}
+ Set Global Variable ${buyerEnterpriseId}
+ Set Global Variable ${taxRefundRate}
+ Set Global Variable ${proxyPaySurcharge}
+ Set Global Variable ${hasInvoice}
+ Set Global Variable ${accountPeriodType}
+ Set Global Variable ${settleRules}
+ Set Global Variable ${settlePriceIncludeTaxSettleRules}
+ Set Global Variable ${isSubsidyAndDeductIncludeTax}
+ Set Global Variable ${receivableSettlementRules}
+ Set Global Variable ${settlePriceIncludeTaxSettleRules}
+
+Upload_pictures
+ #上传图片
+ #${dict} Create Dictionary Content-Type=image/jpeg filename=20210803.jpg
+ #Create Session ZTBT ${URL} ${dict}
+ ${filepath} Evaluate open('./21042217001449712.png','rb')
+ ${image} Evaluate open('./21042217001449712.png','rb')
+ ${file} Create Dictionary filepath=${filepath} image=${image}
+ Create Session ZTBT ${URL}
+ log ${file}
+ ${result} Post On Session ZTBT recycle-user-center/upload/image files=${file}
+ ${pictures} Get From Dictionary ${result.json()} data
+ log ${result.content}
+ Set Global Variable ${pictures}
+
+get_repeat_proxy-order
+ #获取重复订单信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/repeat/proxy-order params=orderItemId=${orderItemId}&plateNumber=${carList}&settleWeight=17550&weighingDate=${datatime}&orderType=${orderType}&settlePrice= 41953.05
+ ${records} Get From Dictionary ${reps.json()["data"]} records #获取重复订单列表
+ ${orderItemId_list} Create List
+ #sleep 0.5
+ FOR ${items} IN @{records}
+ ${orderItemId} Get From Dictionary ${items} orderItemId #重复订单项编号
+ Append To List ${orderItemId_list} '''${orderItemId}'''
+ END
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ Set Global Variable ${orderItemId_list}
+
+repeat_proxy-order
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ \ \ \ "orderItemId":"${orderItemId}", \ \ \ \ "remark":"${datatime}", \ \ \ \ "repeatOrderItem":${orderItemId_list} }
+ ${reps} Post On Session ZTBT recycle-service/admin/customer-service/confirm/repeat/proxy-order ${data.encode('utf-8')}
+
+weightnote
+ #提交磅单
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "deductedPoint":0, \ \ \ \ "imageUrl":[ \ \ \ \ \ \ \ \ "${pictures}" \ \ \ \ ], \ \ \ \ "orderItemId":"${orderItemId}", \ \ \ \ "unitPrice":"${unitPrice}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "millSupplierId":"${supplier_id}", \ \ \ \ "millSupplierName":"${millSupplierName}", \ \ \ \ "settleUtiPriceIncludeTax":2.04012, \ \ \ \ "settleUtiPriceIncludeTaxType":1, \ \ \ \ "receivableAdjustMoney":"100", \ \ \ \ "refundSubsidy":0.002, \ \ \ \ "adjustMoney":"0", \ \ \ \ "collectionCharges":"${proxyPaySurcharge}", \ \ \ \ "advanceFund":"${advanceFund}", \ \ \ \ "contractId":"${contractId}", \ \ \ \ "warehouseName":"${所属仓库}", \ \ \ \ "weightDay":"${datatime}", \ \ \ \ "settleDay":"${datatime}", \ \ \ \ "transactionMainEnterpriseId":"${交易主体id}", \ \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "proxySellerSettleType":"${proxySellerSettleType}", \ \ \ \ "receivableSettlementRules":"${receivableSettlementRules}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "deductionNotes":"${datatime}", \ \ \ \ "plateNumber":"${carList}", \ \ \ \ "settlePriceIncludeTaxSettleRules":"${settlePriceIncludeTaxSettleRules}", \ \ \ \ "settleUtiPrice":"${settleUtiPrice}", \ \ \ \ "netWeight":300, \ \ \ \ "activitySettleType":null, \ \ \ \ "unitSurcharge":"${unitSurcharge}", \ \ \ \ "deliveryImageUrls":[ \ \ \ \ \ ], \ \ \ \ "publicSubsidies":0, \ \ \ \ "isSubsidyAndDeductIncludeTax":0, \ \ \ \ "orderId":"${orderId}", \ \ \ \ "settleWeight":230, \ \ \ \ "deductedWeight":2, \ \ \ \ "orderType":"${orderType}", \ \ \ \ "otherAmountList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"freightSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"contrabandPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"nonStandardPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ } \ \ \ \ ] }
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/proxy-sell/save/weightnote ${data.encode('utf-8')}
+ log ${reps.json()["data"]}
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]} weightNoteId
+ Set Global Variable ${weightNoteId}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+audit_weightnote
+ Create Session ZTBT ${URL} ${header}
+ ${repsonse} Post On Session ZTBT recycle-service/admin/customer-service/audit/weightnote/${weightNoteId}
+ log ${repsonse.json()}
+
+get_proxy-order
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ log ${reps.json()}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
diff --git a/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/3.1-Operation_audit.robot b/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/3.1-Operation_audit.robot
new file mode 100644
index 0000000..d3b9d91
--- /dev/null
+++ b/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/3.1-Operation_audit.robot
@@ -0,0 +1,144 @@
+*** Settings ***
+Documentation 运营审核-常规
+Test Timeout
+Library DateTime
+Library Collections
+Library RequestsLibrary
+Resource 提交磅单.txt
+Resource 运营审核驳回.txt
+Resource 台账查询.txt
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_operation_list
+ #获取运营审核列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0
+ log ${reps.json()}
+
+get_paper-mill-order-by-orderItemId
+ #根据订单编号获取运营审核单
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0&orderItemId=${orderItemId}
+ log ${reps.json()}
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId #获取审核id
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]["records"][0]} weightNoteId #获取磅单id
+ Set Global Variable ${auditRequestId}
+ Set Global Variable ${weightNoteId}
+
+get_order-log-detail
+ #获取订单日志
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/order-log-detail params=orderId=${orderId}&weightNoteId=${weightNoteId}
+ log ${reps.json()}
+
+get_order-receipt-audit-details
+ #查看运营审核详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ log ${reps.json()}
+ ${auditRequestItemId} Get From Dictionary ${reps.json()["data"]["items"][0]} auditRequestItemId #审核项id
+ ${categoryName} Get From Dictionary ${reps.json()["data"]["items"][0]} categoryName #纸品品类名称
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]["items"][0]} paperCategoryId #纸厂品类id
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} netWeight #净重
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #计划回款日期
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]["items"][0]} plateNumber #车牌号
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${surcharge1} Evaluate ${unitSurcharge}*${netWeight}
+ ${surcharge2} Evaluate ${unitSurcharge}*${settleWeight}
+ ${surcharge} Set Variable If '${proxySellerSettleType}'=='0' ${surcharge1} ${surcharge2} #代卖费总额
+ ${paperMillPayAt} Set Variable If '${paperMillPayAt}'=='无账期' null ${paperMillPayAt} #纸厂账期
+ ${audit_status} Get From Dictionary ${reps.json()["data"]} status
+ Set Global Variable ${auditRequestItemId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${surcharge}
+ Set Global Variable ${audit_status}
+
+order-receipt-audit-details
+ #b保存磅单信息
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d #获取当前时间
+ ${data} Set Variable { \ \ \ \ "auditRequestItemId":"${auditRequestItemId}", \ \ \ \ "categoryName":"${categoryName}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "paperMillPayAt":"${paperMillPayAt}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "settlementDate":"${datatime}", \ \ \ \ "weighingDate":"${datatime}", \ \ \ \ "settleWeight":"${settleWeight}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "fundSourceId":"${id}", \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "publicSubsidies":"${publicSubsidies}", \ \ \ \ "publicSubsidiesIncludeTax":0, \ \ \ \ "settleUnitPrice":"${settleUtiPrice}", \ \ \ \ "fundSourceName":"${name}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/edit/order-receipt-audit-details ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+get_order-log-detail2
+ #运营审核驳回操作日志
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/order-log-detail params=orderId=${orderId}&weightNoteId=${weightNoteId} &operationStatus=2
+ log ${reps.json()}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+重复执行驳回上传磅单
+ #重复执行上传磅单、运营驳回操作
+ FOR ${items} IN RANGE 2
+ Run Keyword get_operation_list
+ Run Keyword get_order-receipt-audit-details
+ Run Keyword If '${audit_status}'=='0' Run Keyword 运营审核驳回
+ sleep 1
+ Run Keyword 获取磅单详情
+ Run Keyword If '${status}'=='51' weightnote
+ Run Keyword audit_weightnote
+ Run Keyword 获取上传磅单后的订单详情
+ Run Keyword 台账查询
+ END
+
+get_operation_list1
+ #获取运营审核列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0&orderItemId=&orderId=${orderId}
+ ${audit_status} Get From Dictionary ${reps.json()["data"]["records"][0]} status
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId
+ Set Global Variable ${audit_status}
+ Set Global Variable ${auditRequestId}
+
+get_order-receipt-audit-details1
+ #查看运营审核详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ log ${reps.json()}
+ ${auditRequestItemId} Get From Dictionary ${reps.json()["data"]["items"][0]} auditRequestItemId #审核项id
+ ${categoryName} Get From Dictionary ${reps.json()["data"]["items"][0]} categoryName #纸品品类名称
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]["items"][0]} paperCategoryId #纸厂品类id
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} netWeight #净重
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #计划回款日期
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]["items"][0]} plateNumber #车牌号
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${settleWeight} Set Variable If '${settleWeight}'=='None' 0 ${settleWeight}
+ ${surcharge1} Evaluate ${unitSurcharge}*${netWeight}
+ ${surcharge2} Evaluate ${unitSurcharge}*${settleWeight}
+ ${surcharge} Set Variable If '${proxySellerSettleType}'=='0' ${surcharge1} ${surcharge2} #代卖费总额
+ ${paperMillPayAt} Set Variable If '${paperMillPayAt}'=='无账期' null ${paperMillPayAt} #纸厂账期
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]} auditRequestId
+ Set Global Variable ${auditRequestItemId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${surcharge}
+ Set Global Variable ${auditRequestId}
+
+order-receipt-audit-details1
+ #b保存磅单信息
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d #获取当前时间
+ ${data} Set Variable { \ \ \ \ "auditRequestItemId":"${auditRequestItemId}", \ \ \ \ "categoryName":"${categoryName}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "paperMillPayAt":"${paperMillPayAt}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "settlementDate":"${datatime}", \ \ \ \ "weighingDate":"${datatime}", \ \ \ \ "settleWeight":"${settleWeight}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "fundSourceId":"${id}", \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "publicSubsidies":"${publicSubsidies}", \ \ \ \ "publicSubsidiesIncludeTax":0, \ \ \ \ "settleUnitPrice":"${settleUtiPrice}", \ \ \ \ "fundSourceName":"${name}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/edit/order-receipt-audit-details ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+operation_audit
+ #运营审核确认通过
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ "auditRequestId":"${auditRequestId}", \ \ \ \ "isPass":1, \ \ \ \ "remark":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/operation/audit ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
diff --git a/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/__init__.robot b/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/__init__.robot
new file mode 100644
index 0000000..e69de29
diff --git a/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/台账查询.txt b/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/台账查询.txt
new file mode 100644
index 0000000..2071449
--- /dev/null
+++ b/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/台账查询.txt
@@ -0,0 +1,21 @@
+*** Settings ***
+Library Collections
+Library RequestsLibrary
+
+*** Variables ***
+${URL} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+台账查询
+ #获取台账列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/parameter/get/parameter params=pageNum=1&pageSize=10&withdrawState=&state=&orderItemId=${orderItemId}
+ ${台账列表数据} Get From List ${reps.json()["data"]["records"]} 0 #获取台账列表数据
+ #Set Global Variable ${台账列表数据}
+ Should Be Equal As Numbers ${netWeight} ${reps.json()["data"]["records"][0]["netWeight"]}
+ Should Be Equal As Numbers ${unitSurcharge} ${reps.json()["data"]["records"][0]["unitSurcharge"]}
+ Should Be Equal As Numbers ${settleWeight} ${reps.json()["data"]["records"][0]["settleWeight"]}
+ Should Be Equal As Numbers ${settleUnitPrice} ${reps.json()["data"]["records"][0]["settleUtiPrice"]}
+ Should Be Equal As Numbers ${receivableAdjustMoney} ${reps.json()["data"]["records"][0]["receivableAdjustMoney"]}
+ Should Be Equal As Numbers ${adjustMoney} ${reps.json()["data"]["records"][0]["adjustMoney"]}
diff --git a/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/提交磅单.txt b/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/提交磅单.txt
new file mode 100644
index 0000000..6545de7
--- /dev/null
+++ b/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/提交磅单.txt
@@ -0,0 +1,172 @@
+*** Settings ***
+Library RequestsLibrary
+Library DateTime
+Library Collections
+
+*** Variables ***
+${URL} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+获取磅单详情
+ #查看订单列表详情
+ Create Session ZTBT ${URL} ${header}
+ #${data} Set Variable orderId=${orderId} orderItemId=${orderItemId}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #当前订单下单时的合同id
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} unitSurcharge #代卖费
+ ${proxySellerSettleType} Get From Dictionary ${reps.json()["data"]} proxySellerSettleType #代卖费结算方式
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]} paperCategoryId #纸厂品类ID
+ ${unitPrice} Get From Dictionary ${reps.json()["data"]} paperCategoryPrice #品类单价
+ ${publicSubsidies} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} publicSubsidies #公开补贴
+ ${millSupplierId} Get From Dictionary ${reps.json()["data"]} millSupplierId #纸厂供应商ID
+ ${paperMillSupplierName} Get From Dictionary ${reps.json()["data"]} paperMillSupplierName #纸厂供应商名称
+ ${publicSubsidies} Set Variable If '${publicSubsidies}'=='${null}' 0 ${publicSubsidies}
+ #${settleUtiPrice} Evaluate ${unitPrice}+${publicSubsidies} #结算单价
+ ${unitSurcharge} Set Variable If '${unitSurcharge}'=='${None}' 0 ${unitSurcharge}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ ${磅单id} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} id #获取磅单id
+ ${status} Get From Dictionary ${reps.json()["data"]} status
+ ${receivableAdjustMoney} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} receivableAdjustMoney #获取应收调节费
+ ${adjustMoney} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} adjustMoney #获取调节费
+ ${receivableAdjustMoney} Set Variable If '${receivableAdjustMoney}'=='${None}' 0 ${receivableAdjustMoney}
+ ${adjustMoney} Set Variable If '${adjustMoney}'=='${None}' 0 ${adjustMoney}
+ ${settleUtiPrice} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} settleUtiPrice #获取结算单价
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} netWeight #获取净重
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} settleWeight #获取结算重量
+ ${netWeight1} Evaluate ${netWeight}+30
+ FOR ${净重index} IN RANGE ${netWeight} 30
+ Exit For Loop If '${净重index}'=='${netWeight1}'
+ END
+ ${settleWeight1} Evaluate ${settleWeight}+30
+ FOR ${结算重量index} IN RANGE ${settleWeight} 30
+ Exit For Loop If '${结算重量index}'=='${settleWeight1}'
+ END
+ ${unitSurcharge1} Evaluate ${unitSurcharge}+0.001
+ FOR ${代卖费index} IN RANGE ${unitSurcharge} 100
+ Exit For Loop If '${代卖费index}'=='${unitSurcharge1}'
+ END
+ ${settleUtiPrice1} Evaluate ${settleUtiPrice}+0.1
+ FOR ${结算单价index} IN RANGE ${settleUtiPrice} 100
+ Exit For Loop If '${结算单价index}'=='${settleUtiPrice1}'
+ END
+ ${receivableAdjustMoney1} Evaluate ${receivableAdjustMoney}+10
+ FOR ${应收调节费index} IN RANGE ${receivableAdjustMoney} 500
+ Exit For Loop If '${应收调节费index}'=='${receivableAdjustMoney1}'
+ END
+ ${adjustMoney1} Evaluate ${adjustMoney}+10
+ FOR ${应收调节费index} IN RANGE ${adjustMoney} 500
+ Exit For Loop If '${应收调节费index}'=='${adjustMoney1}'
+ END
+ Set Global Variable ${contractId}
+ Set Global Variable ${unitSurcharge}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${settleUtiPrice1}
+ Set Global Variable ${unitPrice}
+ Set Global Variable ${publicSubsidies}
+ Set Global Variable ${millSupplierId}
+ Set Global Variable ${paperMillSupplierName}
+ Set Global Variable ${proxySellerSettleType}
+ Set Global Variable ${contractId}
+ Set Global Variable ${netWeight1}
+ Set Global Variable ${settleWeight1}
+ Set Global Variable ${磅单id}
+ Set Global Variable ${status}
+ Set Global Variable ${unitSurcharge1}
+ Set Global Variable ${adjustMoney1}
+ Set Global Variable ${receivableAdjustMoney1}
+
+weightnote
+ #驳回后重新提交磅单
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "deductedPoint":0, \ \ \ \ "imageUrl":[ \ \ \ \ \ \ \ \ "${pictures}" \ \ \ \ ], \ \ \ \ "orderItemId":"${orderItemId}", \ \ \ \ "unitPrice":"${unitPrice}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "millSupplierId":"${supplier_id}", \ \ \ \ "millSupplierName":"${millSupplierName}", \ \ \ \ "settleUtiPriceIncludeTax":2.04012, \ \ \ \ "settleUtiPriceIncludeTaxType":1, \ \ \ \ "receivableAdjustMoney":"${receivableAdjustMoney1}", \ \ \ \ "refundSubsidy":0.002, \ \ \ \ "adjustMoney":"${adjustMoney1}", \ \ \ \ "collectionCharges":"${proxyPaySurcharge}", \ \ \ \ "advanceFund":"${advanceFund}", \ \ \ \ "contractId":"${contractId}", \ \ \ \ "warehouseName":"${所属仓库}", \ \ \ \ "weightDay":"${datatime}", \ \ \ \ "settleDay":"${datatime}", \ \ \ \ "transactionMainEnterpriseId":"${交易主体id}", \ \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "proxySellerSettleType":"${proxySellerSettleType}", \ \ \ \ "receivableSettlementRules":"${receivableSettlementRules}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "deductionNotes":"${datatime}", \ \ \ \ "plateNumber":"${carList}", \ \ \ \ "settlePriceIncludeTaxSettleRules":"${settlePriceIncludeTaxSettleRules}", \ \ \ \ "settleUtiPrice":"${settleUtiPrice1}", \ \ \ \ "netWeight":"${netWeight1}", \ \ \ \ "activitySettleType":null, \ \ \ \ "unitSurcharge":"${unitSurcharge1}", \ \ \ \ "deliveryImageUrls":[ \ \ \ \ \ ], \ \ \ \ "publicSubsidies":0, \ \ \ \ "isSubsidyAndDeductIncludeTax":0, \ \ \ \ "orderId":"${orderId}", \ \ \ \ "settleWeight":"${settleWeight1}", \ \ \ \ "deductedWeight":2, \ \ \ \ "orderType":"${orderType}", \ \ \ \ "otherAmountList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"freightSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"contrabandPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"nonStandardPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ } \ \ \ \ ], \ \ \ \ "id":"${磅单id}" \ \ \ \ }
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/proxy-sell/update/weightnote ${data.encode('utf-8')}
+ log ${reps.json()["data"]}
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]} weightNoteId
+ Set Global Variable ${weightNoteId}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+获取上传磅单后的订单详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ ${settleUnitPrice} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} settleUtiPrice #获取结算单价
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} unitSurcharge #获取代卖费
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} netWeight #获取净重
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} settleWeight #获取结算重量
+ ${receivableAdjustMoney} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} receivableAdjustMoney #获取应收调节费
+ ${adjustMoney} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} adjustMoney #获取调节费
+ Set Global Variable ${settleUnitPrice}
+ Set Global Variable ${unitSurcharge}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${receivableAdjustMoney}
+ Set Global Variable ${adjustMoney}
+
+获取送货单详情
+ #获取订单详情信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId} &orderItemId=${orderItemId}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ ${paperMillId} Get From Dictionary ${reps.json()["data"]} paperMillId #纸厂id
+ ${paperCategoryPrice} Get From Dictionary ${reps.json()["data"]} paperCategoryPrice #品类价格
+ ${publicSubsidies} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} publicSubsidies #公开补贴
+ ${activitySettleType} Get From Dictionary ${reps.json()["data"]} activitySettleType #活动订单结算方式
+ ${proxySellerSettleType} Get From Dictionary ${reps.json()["data"]} proxySellerSettleType #代卖费结算方式
+ ${交易主体id} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseId #交易主体id
+ ${交易主体name} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseName #交易主体name
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]} unitSurcharge #代卖费单价
+ ${publicSubsidies} Set Variable If '${publicSubsidies}'=='${null}' 0 ${publicSubsidies}
+ ${settleUtiPrice}= Evaluate ${unitPrice}+${publicSubsidies} #结算单价
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ ${磅单id} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} id #获取磅单id
+ ${status} Get From Dictionary ${reps.json()["data"]} status
+ ${unitSurcharge3} Evaluate ${unitSurcharge}+0.001
+ FOR ${代卖费index} IN RANGE ${unitSurcharge} 100
+ Exit For Loop If '${代卖费index}'=='${unitSurcharge3}'
+ END
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} netWeight #获取净重
+ ${netWeight3} Evaluate ${netWeight}+300
+ FOR ${净重index} IN RANGE ${netWeight} 30
+ Exit For Loop If '${净重index}'=='${netWeight3}'
+ END
+ Set Global Variable ${contractId}
+ Set Global Variable ${paperMillId}
+ Set Global Variable ${paperCategoryPrice}
+ Set Global Variable ${publicSubsidies}
+ Set Global Variable ${activitySettleType}
+ Set Global Variable ${proxySellerSettleType}
+ Set Global Variable ${settleUtiPrice}
+ Set Global Variable ${交易主体id}
+ Set Global Variable ${交易主体name}
+ Set Global Variable ${unitSurcharge3}
+ Set Global Variable ${netWeight3}
+ Set Global Variable ${磅单id}
+ Set Global Variable ${status}
+
+上传送货单
+ #上传送货单
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "settleUtiPrice":"${settleUtiPrice}", \ \ \ \ "publicSubsidies":0, \ \ \ \ "netWeight":"${netWeight3}", \ \ \ \ "settleWeight":null, \ \ \ \ "unitSurcharge":${unitSurcharge3}, \ \ \ \ "transactionMainEnterpriseId":"${交易主体id}", \ \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "activitySettleType":"${activitySettleType}", \ \ \ \ "proxySellerSettleType":"${proxySellerSettleType}", \ \ \ \ "remark":null, \ \ \ \ "imageUrl":[ \ \ \ \ \ \ \ \ "${pictures}" \ \ \ \ ], \ \ \ \ "orderItemId":"${orderItemId}", \ \ \ \ "orderId":"${orderId}", \ \ \ \ "settleDay":"${datatime}", \ \ \ \ "settlePrice":0, \ \ \ \ "contractId":"${contractId}", \ \ \ \ "millSupplierId":"${supplier_id}", \ \ \ \ "millSupplierName":"${millSupplierName}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "orderType":"${orderType}", \ \ \ \ "weightDay":"${datatime}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "warehouseName":"${所属仓库}", \ \ \ \ "deductionNotes":"${datatime}", \ \ \ \ "receivableSettlementRules":"${receivableSettlementRules}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "otherAmountList":[ \ \ \ \ \ ], \ \ \ \ "unitPrice":"${paperCategoryPrice}", \ \ \ \ "id":"${磅单id}" \ \ \ \ \ }
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/proxy-sell/update/weightnote ${data.encode('utf-8')}
+ log ${reps.json()}
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]} weightNoteId #磅单编号
+ Set Global Variable ${weightNoteId}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ Set Global Variable ${datatime}
+
+获取上传送货单后的订单详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} netWeight #获取净重
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} unitSurcharge #获取代卖费
+ Set Global Variable ${netWeight}
+ Set Global Variable ${unitSurcharge}
+
+audit_weightnote
+ Create Session ZTBT ${URL} ${header}
+ ${repsonse} Post On Session ZTBT recycle-service/admin/customer-service/audit/weightnote/${weightNoteId}
+ log ${repsonse.json()}
diff --git a/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/运营审核驳回.txt b/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/运营审核驳回.txt
new file mode 100644
index 0000000..2098597
--- /dev/null
+++ b/000-Regularorder/2-Background_system(Test)/2.1-Consignment management/运营审核驳回.txt
@@ -0,0 +1,61 @@
+*** Settings ***
+Library RequestsLibrary
+Library DateTime
+Library Collections
+
+*** Variables ***
+${URL} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+get_operation_list
+ #获取运营审核列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0&orderItemId=&orderId=${orderId}
+ ${audit_status} Get From Dictionary ${reps.json()["data"]["records"][0]} status
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId
+ Set Global Variable ${audit_status}
+ Set Global Variable ${auditRequestId}
+
+get_order-receipt-audit-details
+ #查看运营审核详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ log ${reps.json()}
+ ${auditRequestItemId} Get From Dictionary ${reps.json()["data"]["items"][0]} auditRequestItemId #审核项id
+ ${categoryName} Get From Dictionary ${reps.json()["data"]["items"][0]} categoryName #纸品品类名称
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]} paperCategoryId #纸厂品类id
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} netWeight #净重
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #计划回款日期
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]["items"][0]} plateNumber #车牌号
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${settleWeight} Set Variable If '${settleWeight}'=='None' 0 ${settleWeight}
+ ${surcharge1} Evaluate ${unitSurcharge}*${netWeight}
+ ${surcharge2} Evaluate ${unitSurcharge}*${settleWeight}
+ ${surcharge} Set Variable If '${proxySellerSettleType}'=='0' ${surcharge1} ${surcharge2} #代卖费总额
+ ${paperMillPayAt} Set Variable If '${paperMillPayAt}'=='无账期' null ${paperMillPayAt} #纸厂账期
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]} auditRequestId
+ Set Global Variable ${auditRequestItemId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${surcharge}
+ Set Global Variable ${auditRequestId}
+
+保存磅单信息
+ #b保存磅单信息
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d #获取当前时间
+ ${data} Set Variable { \ \ \ \ "auditRequestItemId":"${auditRequestItemId}", \ \ \ \ "categoryName":"${categoryName}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "paperMillPayAt":"${paperMillPayAt}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "settlementDate":"${datatime}", \ \ \ \ "weighingDate":"${datatime}", \ \ \ \ "settleWeight":"${settleWeight}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "fundSourceId":"${id}", \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "publicSubsidies":"${publicSubsidies}", \ \ \ \ "publicSubsidiesIncludeTax":0, \ \ \ \ "settleUnitPrice":"${settleUtiPrice}", \ \ \ \ "fundSourceName":"${name}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/edit/order-receipt-audit-details ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+运营审核驳回
+ #运营审核驳回
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "auditRequestId":"${auditRequestId}", \ \ \ \ "isPass":2, \ \ \ \ "remark":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/operation/audit ${data.encode('utf-8')}
diff --git a/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/4-Financial_audit.robot b/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/4-Financial_audit.robot
new file mode 100644
index 0000000..6ed7927
--- /dev/null
+++ b/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/4-Financial_audit.robot
@@ -0,0 +1,54 @@
+*** Settings ***
+Documentation 代卖应付
+Library RequestsLibrary
+Library Collections
+Resource 财务审核驳回.txt
+Resource 运营审核通过.txt
+Resource 台账查询.txt
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${url} http://api-ops-psc-test.qniao.cn
+${URL1} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_list
+ #获取财务审核列表
+ Create Session ZTBT ${url} ${header}
+ ${reps} Get On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/get/list params=pageNum=1&pageSize=10&status=&orderId=&orderItemId=${orderItemId}
+ ${auditedTime} Get From Dictionary ${reps.json()["data"]["records"][0]} auditedTime #财务第一次确认结算时间
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ #Set Global Variable ${auditedTime}
+
+get_order-log-detail
+ #财务审核驳回操作记录
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/order-log-detail params=orderId=${orderId}&weightNoteId=${weightNoteId}&operationStatus=3
+
+重复执行财务审核驳回何运营审核通过
+ #重复执行财务审核驳回何运营审核通过操作
+ FOR ${index} IN RANGE 5
+ Run Keyword 获取财务审核列表
+ Run Keyword If '${staus}'=='0' 财务驳回
+ Run Keyword get_operation_list
+ Run Keyword get_order-receipt-audit-details
+ Run Keyword order-receipt-audit-details
+ Run Keyword If '${audit_status}'=='0' 运营审核通过
+ Run Keyword 运营审核后详情
+ Run Keyword 台账查询
+ END
+
+paper-mill-order-receipt-proof-request_audit
+ #财务审核确认通过
+ Create Session ZTBT ${url} ${header}
+ ${data} Set Variable {"auditRequestId":"${auditRequestId}","adminId":null,"isPass":1,"remark":"${datatime}" }
+ ${reps} Post On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/audit ${data.encode('utf-8')}
+ log ${reps.json()}
+ sleep 1
+
+paper-mill-order-receipt-proof-request_settle
+ #确认结算
+ Create Session ZTBT ${url} ${header}
+ ${data} Set Variable { \ \ \ \ "id":"${auditRequestId}", \ \ \ \ "adminId":null }
+ ${reps} Post On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/settle ${data.encode('utf-8')}
+ sleep 1
diff --git a/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/5-Sales_receivables.robot b/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/5-Sales_receivables.robot
new file mode 100644
index 0000000..3ebbe95
--- /dev/null
+++ b/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/5-Sales_receivables.robot
@@ -0,0 +1,36 @@
+*** Settings ***
+Documentation 代卖应收
+Library RequestsLibrary
+Library Collections
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_paper-payment-order-list
+ #通过订单编号获取代卖应收列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-payment-order-list params=pageNum=1&pageSize=10&orderId=${orderId}
+ ${paymentOrderId} Get From Dictionary ${reps.json()["data"]["records"][0]} id #回款单号
+ log ${reps.json()}
+ Set Global Variable ${paymentOrderId}
+
+get_order-receipt-audit-details
+ #代卖应收详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ ${receivablePriceIncludeTax} Get From Dictionary ${reps.json()["data"]["items"][0]} receivablePriceIncludeTax
+ #${receivablePrice} Get From Dictionary ${reps.json()["data"]["items"][0]} receivablePrice #获取应收金额
+ ${noReceivablePrice} Get From Dictionary ${reps.json()["data"]["items"][0]} noReceivablePrice #获取未收金额
+ #Set Global Variable ${receivablePrice}
+ Set Global Variable ${receivablePriceIncludeTax}
+ Set Global Variable ${noReceivablePrice}
+
+update_payment-order-status
+ #确认回款操作
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ \ \ \ "paymentOrderId":"${paymentOrderId}", \ \ \ \ "receivablePrice":"${receivablePriceIncludeTax}", \ \ \ \ "paidPrice":"${receivablePriceIncludeTax}", \ \ \ \ "noReceiveblePrice":"${noReceivablePrice}", \ \ \ \ "bankFlowNo":null, \ \ \ \ "paymentAdjustmentFee":null, \ \ \ \ "returnPayDate":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/update/payment-order-status ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ sleep 1
diff --git a/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/台账查询.txt b/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/台账查询.txt
new file mode 100644
index 0000000..64abf98
--- /dev/null
+++ b/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/台账查询.txt
@@ -0,0 +1,20 @@
+*** Settings ***
+Library Collections
+Library RequestsLibrary
+
+*** Variables ***
+${URL1} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+台账查询
+ #获取台账列表
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/parameter/get/parameter params=pageNum=1&pageSize=10&withdrawState=&state=&orderItemId=${orderItemId}
+ ${台账列表数据} Get From List ${reps.json()["data"]["records"]} 0 #获取台账列表数据
+ #Set Global Variable ${台账列表数据}
+ #${receivableAdjustMoney1} Get From Dictionary ${reps.json()["data"]["records"][0]} receivableAdjustMoney #获取应收调节费
+ #${receivableAdjustMoney1} Set Variable If '${receivableAdjustMoney}'=='None' Should Not Be Equal As Numbers ${receivableAdjustMoney} ${receivableAdjustMoney1}
+ #Should Be Equal As Numbers ${receivableAdjustMoney} ${reps.json()["data"]["records"][0]["receivableAdjustMoney"]} #对比应收调节费
+ Should Be Equal As Numbers ${noReceivablePrice} ${reps.json()["data"]["records"][0]["noReceivablePrice"]} #对比未收款金额
+ Should Be Equal As Strings ${paperMillPayAt} ${reps.json()["data"]["records"][0]["paperMillPayAt"]} #对比预计回款日期
diff --git a/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/财务审核驳回.txt b/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/财务审核驳回.txt
new file mode 100644
index 0000000..d9f1ba8
--- /dev/null
+++ b/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/财务审核驳回.txt
@@ -0,0 +1,30 @@
+*** Settings ***
+Library Collections
+Library DateTime
+Library RequestsLibrary
+
+*** Variables ***
+${URL1} http://api-ops-ztb-test.qniao.cn
+${url} http://api-ops-psc-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+获取财务审核列表
+ #获取财务审核列表
+ Create Session ZTBT ${url} ${header}
+ ${reps} Get On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/get/list params=pageNum=1&pageSize=10&status=&orderId=&orderItemId=${orderItemId}
+ #${auditedTime} Get From Dictionary ${reps.json()["data"]["records"][0]} auditedTime #财务第一次确认结算时间
+ ${staus} Get From Dictionary ${reps.json()["data"]["records"][0]} status #获取审核状态
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ #Set Global Variable ${auditedTime}
+ Set Global Variable ${staus}
+ Set Global Variable ${auditRequestId}
+
+财务驳回
+ #财务审核驳回
+ Create Session ZTBT ${url} ${header}
+ ${data} Set Variable {"auditRequestId":"${auditRequestId}","adminId":null,"isPass":2,"remark":"${datatime}" }
+ ${reps} Post On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/audit ${data.encode('utf-8')}
+ log ${reps.json()}
+ sleep 1
diff --git a/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/运营审核通过.txt b/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/运营审核通过.txt
new file mode 100644
index 0000000..74be8e4
--- /dev/null
+++ b/000-Regularorder/2-Background_system(Test)/3-Withdrawal_application/运营审核通过.txt
@@ -0,0 +1,72 @@
+*** Settings ***
+Library RequestsLibrary
+Library DateTime
+Library Collections
+
+*** Variables ***
+${URL1} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+get_operation_list
+ #获取运营审核列表
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0&orderItemId=&orderId=${orderId}
+ ${audit_status} Get From Dictionary ${reps.json()["data"]["records"][0]} status
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId
+ Set Global Variable ${audit_status}
+ Set Global Variable ${auditRequestId}
+
+get_order-receipt-audit-details
+ #查看运营审核详情
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ log ${reps.json()}
+ ${auditRequestItemId} Get From Dictionary ${reps.json()["data"]["items"][0]} auditRequestItemId #审核项id
+ ${categoryName} Get From Dictionary ${reps.json()["data"]["items"][0]} categoryName #纸品品类名称
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]["items"][0]} paperCategoryId #纸厂品类id
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} netWeight #净重
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #计划回款日期
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]["items"][0]} plateNumber #车牌号
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${settleWeight} Set Variable If '${settleWeight}'=='None' 0 ${settleWeight}
+ ${surcharge1} Evaluate ${unitSurcharge}*${netWeight}
+ ${surcharge2} Evaluate ${unitSurcharge}*${settleWeight}
+ ${surcharge} Set Variable If '${proxySellerSettleType}'=='0' ${surcharge1} ${surcharge2} #代卖费总额
+ ${paperMillPayAt} Set Variable If '${paperMillPayAt}'=='无账期' null ${paperMillPayAt} #纸厂账期
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]} auditRequestId
+ Set Global Variable ${auditRequestItemId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${surcharge}
+ Set Global Variable ${auditRequestId}
+
+order-receipt-audit-details
+ #b保存磅单信息
+ Create Session ZTBT ${URL1} ${header}
+ ${data} Set Variable { \ \ \ \ "auditRequestItemId":"${auditRequestItemId}", \ \ \ \ "categoryName":"${categoryName}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "paperMillPayAt":"${paperMillPayAt}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "settlementDate":"${datatime}", \ \ \ \ "weighingDate":"${datatime}", \ \ \ \ "settleWeight":"${settleWeight}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "fundSourceId":"${id}", \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "publicSubsidies":"${publicSubsidies}", \ \ \ \ "publicSubsidiesIncludeTax":0, \ \ \ \ "settleUnitPrice":"${settleUtiPrice}", \ \ \ \ "fundSourceName":"${name}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/edit/order-receipt-audit-details ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+运营审核通过
+ #运营审核通过
+ Create Session ZTBT ${URL1} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "auditRequestId":"${auditRequestId}", \ \ \ \ "isPass":1, \ \ \ \ "remark":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/operation/audit ${data.encode('utf-8')}
+
+运营审核后详情
+ #查看运营审核详情
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ ${noReceivablePrice} Get From Dictionary ${reps.json()["data"]["items"][0]} noReceivablePrice #获取未收款金额
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #获取计划回款日期
+ ${receivableAdjustMoney} Get From Dictionary ${reps.json()["data"]["items"][0]} receivableAdjustMoney #获取应收调节费
+ #${noReceivablePrice} Evaluate ${noReceivablePrice}+1
+ Set Global Variable ${noReceivablePrice}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${receivableAdjustMoney}
diff --git a/001-Activeorder/1-Client(Test)/1-APPlogin(Test).robot b/001-Activeorder/1-Client(Test)/1-APPlogin(Test).robot
new file mode 100644
index 0000000..5e7cc34
--- /dev/null
+++ b/001-Activeorder/1-Client(Test)/1-APPlogin(Test).robot
@@ -0,0 +1,37 @@
+*** Settings ***
+Library RequestsLibrary
+Library Collections
+Library urllib3
+Library DatabaseLibrary
+
+*** Variables ***
+${header} {'content-type':'application/json','X-APP-ID':'470236309865238528'}
+${url} http://api-client-ztb-test.qniao.cn
+
+*** Test Cases ***
+userlogin
+ [Setup]
+ #验证码登录
+ Disable Warnings
+ Create Session ZTBT https://api-client-uec-test.qniao.cn ${header}
+ ${data} Create Dictionary account=18888888888 captcha=888888 accountType=2
+ ${account} Set Variable 18888888888
+ #${data} Set Variable {"accountType":2,"account":"${account}","captcha":888888}
+ ${respones} POST On Session ZTBT uec/authorize/by-captcha json=${data}
+ log ${respones.status_code}
+ log ${respones.json()}
+ ${token} Get From Dictionary ${respones.json()["data"]} token
+ Set Global Variable ${token}
+ Set Global Variable ${account}
+ [Teardown]
+
+login-token
+ #${header} Create Dictionary content-type=application/json X-APP-ID=470236309865238528
+ Create Session ZTBT ${url} ${header}
+ ${token1} Create Dictionary loginToken=${token}
+ ${reps} Post On Session ZTBT recycle-user-center/authorize/get/product-line-token/by/login-token json=${token1}
+ ${gettoken} Get From Dictionary ${reps.json()["data"]} token #获取token
+ ${userId} Get From Dictionary ${reps.json()["data"]} userId #获取用户id
+ log ${reps.json()["data"]["token"]}
+ Set Global Variable ${gettoken}
+ Set Global Variable ${userId}
diff --git a/001-Activeorder/1-Client(Test)/2.2createActiveorder-1.robot b/001-Activeorder/1-Client(Test)/2.2createActiveorder-1.robot
new file mode 100644
index 0000000..9f585e2
--- /dev/null
+++ b/001-Activeorder/1-Client(Test)/2.2createActiveorder-1.robot
@@ -0,0 +1,75 @@
+*** Settings ***
+Library DateTime
+Library Collections
+Library RequestsLibrary
+
+*** Variables ***
+${url} http://api-client-ztb-test.qniao.cn
+${headers} {'content-type':'application/json','X-APP-ID':'470236309865238528','Authorization':'QNT ${gettoken}'}
+
+*** Test Cases ***
+proxy-sell-activity_list
+ #获取活动代卖列表
+ Create Session ZTBT ${url} ${headers}
+ ${repsponse} Get On Session ZTBT recycle-service/proxy-sell-activity/list params=pageNum=1&pageSize=15
+ ${records} Get From Dictionary ${repsponse.json()["data"]} records #获取代卖活动列表
+ FOR ${item} IN @{records}
+ ${activityName} Get From Dictionary ${item} activityName #获取活动名称
+ ${paperCategoryList} Get From Dictionary ${item} paperCategoryList #获取纸厂品类
+ ${paperMillId} Get From Dictionary ${item} paperMillId #获取纸厂id
+ ${activityId} Get From Dictionary ${item} activityId #获取活动id
+ Exit For Loop If '${activityName}'=='Ceshi_factory--一次'
+ END
+ ${Category_value} Evaluate random.choice(${paperCategoryList}) random #获取纸品列表
+ log to console \nvalue: ${Category_value}
+ ${categoryId} Get From Dictionary ${Category_value} categoryId #获取纸品id
+ ${categoryName} Get From Dictionary ${Category_value} categoryName #获取纸品名称
+ ${unitPrice} Get From Dictionary ${Category_value} unitPrice #获取纸品价格
+ Set Global Variable ${paperMillId}
+ Set Global Variable ${activityId}
+ Set Global Variable ${categoryId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${unitPrice}
+
+get-carinfo
+ #获取使用过的车辆信息
+ #${header} Create Dictionary content-type=application/json X-APP-ID=470236309865238528 Authorization=${gettoken}
+ Create Session get-carinfo ${url} ${headers}
+ ${reps} Get On Session get-carinfo recycle-service/proxy-sell/get/his-car-info
+ log ${reps.json()}
+ ${carNumber} Get From Dictionary ${reps.json()["data"]} records #车辆列表
+ ${plateNumber_value} Evaluate random.sample(${carNumber},1) random
+ log to console \nvalue:${plateNumber_value}
+ ${plateNumber1} Get From Dictionary ${plateNumber_value[0]} plateNumber #车辆信息1
+ #${plateNumber2} Get From Dictionary ${plateNumber_value[1]} plateNumber #车辆信息2
+ Set Global Variable ${plateNumber1}
+ #Set Global Variable ${plateNumber2}
+
+get_paper-mill-paper-category-price-details
+ #获取纸厂详情
+ Create Session ZTBT ${url} ${headers}
+ ${reps} Get On Session ZTBT recycle-service/get/paper-mill-paper-category-price-details/${paperMillId}
+ log ${reps.json()}
+
+get_relation
+ #创建用户和业务归属人关系
+ Create Session ZTBT ${url} ${headers}
+ ${reps} Get On Session ZTBT recycle-service/proxy-sell/get/relation
+ ${bizUserId} Get From Dictionary ${reps.json()["data"]} bizUserId #业务归属人id
+ ${cusormerId} Get From Dictionary ${reps.json()["data"]} cusormerId #用户id
+ ${customerName} Get From Dictionary ${reps.json()["data"]} customerName #用户名称
+ Set Global Variable ${bizUserId}
+ Set Global Variable ${cusormerId}
+ Set Global Variable ${customerName}
+
+create_order
+ #创建代卖活动订单-1次付款
+ Create Session ZTBT ${url} ${headers}
+ ${datatime} get current date result_format=%Y-%m-%d
+ ${order_data} Set Variable { \ \ \ \ "paperCategoryId":"${categoryId}", \ \ \ \ "unitPrice":"${unitPrice}", \ \ \ \ "totalEstimatedWeight":30000, \ \ \ \ "activityId":"${activityId}", \ \ \ \ "customerName":"${customerName}", \ \ \ \ "deliveryTime":"${datatime}", \ \ \ \ "carInfos":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "plateNumber":"${plateNumber1}" \ \ \ \ \ \ \ \ } \ \ \ \ ] }
+ ${reps} Post On Session ZTBT recycle-service/proxy-sell/create/order ${order_data.encode('utf-8')}
+ log ${reps.json()}
+ ${orderId} Get From Dictionary ${reps.json()["data"]} orderId #获取订单编号
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ Set Global Variable ${orderId}
+ Set Global Variable ${datatime}
diff --git a/001-Activeorder/1-Client(Test)/__init__.robot b/001-Activeorder/1-Client(Test)/__init__.robot
new file mode 100644
index 0000000..4d46599
--- /dev/null
+++ b/001-Activeorder/1-Client(Test)/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Test Setup
diff --git a/001-Activeorder/2-Background_system(Test)/1-WebLogin/weblogin.robot b/001-Activeorder/2-Background_system(Test)/1-WebLogin/weblogin.robot
new file mode 100644
index 0000000..f08ffc4
--- /dev/null
+++ b/001-Activeorder/2-Background_system(Test)/1-WebLogin/weblogin.robot
@@ -0,0 +1,21 @@
+*** Settings ***
+Library RequestsLibrary
+
+*** Test Cases ***
+pwlogin
+ ${header} Create Dictionary Content-Type=application/x-www-form-urlencoded X-APP-ID=470236309865238555
+ Create Session ZTBT http://api-ops-ztb-test.qniao.cn ${header}
+ &{data} Create Dictionary username=laiyonglan@qniao.cn password=qn123456
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/login data=${data}
+ log ${reps.json()}
+ ${gettoken} Set Variable Token 6b08add42d6bcf73abb935b2adf83525
+ Should Be Equal As Strings ${reps.json()["message"]} 登陆成功
+ Set Global Variable ${gettoken}
+
+login-info
+ ${header} Create Dictionary X-APP-ID=470236309865238555 Authorization=Token 6b08add42d6bcf73abb935b2adf83525
+ Create Session login-info http://api-ops-ztb-test.qniao.cn ${header}
+ ${reps_data} Get On Session login-info recycle-service/admin/employee/get/login-info
+ log ${reps_data}
+ Should Be Equal As Strings ${reps_data.json()["message"]} successful
diff --git a/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/1-appointment.robot b/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/1-appointment.robot
new file mode 100644
index 0000000..60ad6a2
--- /dev/null
+++ b/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/1-appointment.robot
@@ -0,0 +1,57 @@
+*** Settings ***
+Documentation 预约送货
+Library RequestsLibrary
+Library Collections
+Library DateTime
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_paper-mill-order-reservation-list
+ Create Session ZTBT ${URL} ${header}
+ ${reps_data} Get On Session ZTBT recycle-service/admin/customer-service/get/paper-mill-order-reservation-list params=pageNum=1&pageSize=10&status=&orderId=${orderId}
+ log ${reps_data.json()}
+ #获取订单编号${orderId}、纸厂id${paperMillId}、订单类型${orderType}
+ ${orderId} Get From Dictionary ${reps_data.json()["data"]["records"][0]} orderId #订单编号
+ ${paperMillId} Get From Dictionary ${reps_data.json()["data"]["records"][0]} paperMillId #纸厂id
+ ${id} Get From Dictionary ${reps_data.json()["data"]["records"][0]} id #预约id
+ ${orderType} Get From Dictionary ${reps_data.json()["data"]["records"][0]} orderType #订单类型
+ ${carNoList} Get From Dictionary ${reps_data.json()["data"]["records"][0]} carNoList #车辆信息列表
+ ${paperMillName} Get From Dictionary ${reps_data.json()["data"]["records"][0]} paperMillName #纸厂名称
+ ${sellerReservationDate} Get From Dictionary ${reps_data.json()["data"]["records"][0]} sellerReservationDate #送货时间
+ #随机获取车辆信息
+ ${carList} Evaluate random.choice(${carNoList}) random
+ log to console \nvalue:${carList}
+ Should Be Equal As Strings ${reps_data.json()["message"]} successful
+ Set Global Variable ${orderId}
+ Set Global Variable ${paperMillId}
+ Set Global Variable ${id}
+ Set Global Variable ${paperMillName}
+ Set Global Variable ${sellerReservationDate}
+ Set Global Variable ${orderType}
+ Set Global Variable ${carList}
+
+get-supplier
+ Create Session ZTBT http://api-ops-ztb-test.qniao.cn ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/paper-mill-merchant/${paperMillId} params=paperMillId=${paperMillId}
+ log ${reps.json()}
+ #获取供应商id和name
+ ${data} Get From Dictionary ${reps.json()} data
+ ${value} Evaluate random.choice(${data}) random
+ log to console \nvalue: ${value}
+ ${supplier_id} Get From Dictionary ${value} id #供应商id
+ ${millSupplierName} Get From Dictionary ${value} name #供应商名称
+ Set Global Variable ${supplier_id}
+ Set Global Variable ${millSupplierName}
+
+Submit-appointment
+ #${headers} Create Dictionary Content-Type=application/json X-APP-ID=470236309865238555 Authorization=Token 6b08add42d6bcf73abb935b2adf83525
+ #提交预约信息
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} get current date result_format=%Y-%m-%d
+ ${data} Set Variable {"attention":"${orderId}","buyerReservationDate":"${datatime}", "id":"${id}","millDeliveryOrderId":"${orderId}","millSupplierId":"${supplier_id}","millSupplierName":"${millSupplierName}","proxySellerSettleType":0,"scrapeOrderId":"${orderId}"}
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/customer-service/update/reservation ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
diff --git a/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/2.2-RegularUpload-weightnote-1.robot b/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/2.2-RegularUpload-weightnote-1.robot
new file mode 100644
index 0000000..e0cf50b
--- /dev/null
+++ b/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/2.2-RegularUpload-weightnote-1.robot
@@ -0,0 +1,205 @@
+*** Settings ***
+Documentation 上传磅单-一次付款活动
+Library DateTime
+Library RequestsLibrary
+Library Collections
+Library requests
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get-order-item-list
+ #查找预约的订单项列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order-item-list params=orderType=${orderType} &pageNum=1&pageSize=10&status=51&orderId=${orderId}
+ log ${reps.json()}
+ ${records} Get From Dictionary ${reps.json()["data"]} records #获取订单列表
+ ${orderItemId_value} Evaluate random.choice(${records}) random #随机获取订单信息
+ log to console \nvalue: ${orderItemId_value}
+ ${orderItemId} Get From Dictionary ${orderItemId_value} orderItemId #订单项编号
+ Set Global Variable ${orderItemId}
+ #Should Be Equal As Strings ${reps.json()["data"]["records"][0]} orderId=${orderId}
+
+get-order-item-details
+ #获取订单详情信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId} &orderItemId=${orderItemId}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ ${paperMillId} Get From Dictionary ${reps.json()["data"]} paperMillId #纸厂id
+ ${paperCategoryPrice} Get From Dictionary ${reps.json()["data"]} paperCategoryPrice #品类价格
+ ${publicSubsidies} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} publicSubsidies #公开补贴
+ ${activitySettleType} Get From Dictionary ${reps.json()["data"]} activitySettleType #活动订单结算方式
+ ${proxySellerSettleType} Get From Dictionary ${reps.json()["data"]} proxySellerSettleType #代卖费结算方式
+ ${交易主体id} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseId #交易主体id
+ ${交易主体name} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseName #交易主体name
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]} unitSurcharge #代卖费单价
+ ${settleUtiPriceIncludeTaxType} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} settleUtiPriceIncludeTaxType #含税补贴类型
+ ${publicSubsidies} Set Variable If '${publicSubsidies}'=='${null}' 0 ${publicSubsidies}
+ ${settleUtiPrice}= Evaluate ${unitPrice}+${publicSubsidies} #结算单价
+ ${unitSurcharge} Set Variable If '${unitSurcharge}'=='${None}' 0 ${unitSurcharge}
+ Set Global Variable ${contractId}
+ Set Global Variable ${paperMillId}
+ Set Global Variable ${paperCategoryPrice}
+ Set Global Variable ${publicSubsidies}
+ Set Global Variable ${activitySettleType}
+ Set Global Variable ${proxySellerSettleType}
+ Set Global Variable ${settleUtiPrice}
+ Set Global Variable ${交易主体id}
+ Set Global Variable ${交易主体name}
+ Set Global Variable ${unitSurcharge}
+ Set Global Variable ${settleUtiPriceIncludeTaxType}
+
+get_delivery-info
+ #获取订单名片信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/proxy-sell/get/proxy-order/delivery-info/${orderItemId}
+ log ${reps.json()}
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]} plateNumber #车牌号
+ ${settleUtiPrice} Get From Dictionary ${reps.json()["data"]} settleUtiPrice #结算单价
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleUtiPrice}
+
+get_contract_by_id
+ #获取下单时绑定的合同
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/contract/get/detail-by-id params=id=${contractId}
+ log ${reps.json()}
+ #获取垫资费、企业ID、应收金额结算规则、含税结算单价结算规则
+ ${advanceFund} Get From Dictionary ${reps.json()["data"]} advanceFund #垫资费
+ ${accountPeriod} Get From Dictionary ${reps.json()["data"]} accountPeriod #账期
+ ${buyerEnterpriseId} Get From Dictionary ${reps.json()["data"]} buyerEnterpriseId #企业id
+ ${settlePriceIncludeTaxSettleRules} Get From Dictionary ${reps.json()["data"]} settlePriceIncludeTaxSettleRules #含税结算单价结算规则
+ ${taxRefundRate} Get From Dictionary ${reps.json()["data"]} taxRefundRate #税点
+ ${proxyPaySurcharge} Get From Dictionary ${reps.json()["data"]} proxyPaySurcharge #代收费
+ ${hasInvoice} Get From Dictionary ${reps.json()["data"]} hasInvoice #是否开票
+ ${accountPeriodType} Get From Dictionary ${reps.json()["data"]} accountPeriodType #账期类型
+ ${isSubsidyAndDeductIncludeTax} Get From Dictionary ${reps.json()["data"]} isSubsidyAndDeductIncludeTax #纸厂补贴是否含税
+ ${receivableSettlementRules} Get From Dictionary ${reps.json()["data"]} settleRules #应收金额结算规则
+ ${settlePriceIncludeTaxSettleRules} Get From Dictionary ${reps.json()["data"]} settlePriceIncludeTaxSettleRules #含税结算单价结算规则
+ ${advanceFund} Set Variable If '${advanceFund}'=='${None}' 0 ${advanceFund}
+ ${proxyPaySurcharge} Set Variable If '${proxyPaySurcharge}'=='${None}' 0 ${proxyPaySurcharge}
+ Set Global Variable ${advanceFund}
+ Set Global Variable ${accountPeriod}
+ Set Global Variable ${buyerEnterpriseId}
+ Set Global Variable ${taxRefundRate}
+ Set Global Variable ${proxyPaySurcharge}
+ Set Global Variable ${hasInvoice}
+ Set Global Variable ${accountPeriodType}
+ Set Global Variable ${settlePriceIncludeTaxSettleRules}
+ Set Global Variable ${isSubsidyAndDeductIncludeTax}
+ Set Global Variable ${receivableSettlementRules}
+ Set Global Variable ${settlePriceIncludeTaxSettleRules}
+
+get-contract-list
+ #获取订单纸厂的所有合同信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT /recycle-service/admin/contract/get/selectable-contract-list params=orderItemId=${orderItemId}
+ log ${reps.json()}
+
+get-supplier
+ #获取纸厂供应商
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/paper-mill-merchant/${paperMillId} params=paperMillId=${paperMillId}
+ log ${reps.json()}
+
+get-Source of funds
+ #获取资金来源
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/fund-source/get/list
+ log ${reps.json()}
+ ${data} Get From Dictionary ${reps.json()} data
+ FOR ${item} IN @{data}
+ log ${item}
+ ${isDefault} Get From Dictionary ${item} isDefault #获取启用状态
+ ${name} Get From Dictionary ${item} name #获取name
+ ${id} Get From Dictionary ${item} id #获取id
+ Exit For Loop If '${isDefault}'=='1'
+ END
+ Set Global Variable ${name}
+ Set Global Variable ${id}
+
+get-Warehouse
+ #获取所属仓库
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/transaction-main-enterprise/get/warehouse-name
+ ${仓库} Get From Dictionary ${reps.json()} data
+ #随机获取仓库
+ ${所属仓库} Evaluate random.choice(${仓库}) random
+ log to console \nvalue:${所属仓库}
+ Set Global Variable ${所属仓库}
+
+get_proxy-order_delivery-info
+ #获取订单名片信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/proxy-sell/get/proxy-order/delivery-info/${orderItemId}
+ log ${reps.json()}
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]} plateNumber #车牌号
+ ${settleUtiPrice} Get From Dictionary ${reps.json()["data"]} settleUtiPrice #结算单价
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleUtiPrice}
+
+get_paper-mill-category
+ #获取当前纸厂的所有纸品品类
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/paperMill/get/paper-mill-category/${paperMillId} params=id=${paperMillId}
+ log ${reps.json()}
+
+Upload_pictures
+ #上传图片
+ #${dict} Create Dictionary Content-Type=image/jpeg filename=20210803.jpg
+ #Create Session ZTBT ${URL} ${dict}
+ ${filepath} Evaluate open('./16pic_6879381_b.jpg','rb')
+ ${image} Evaluate open('./16pic_6879381_b.jpg','rb')
+ ${file} Create Dictionary filepath=${filepath} image=${image}
+ Create Session ZTBT ${URL}
+ log ${file}
+ ${result} Post On Session ZTBT recycle-user-center/upload/image files=${file}
+ ${pictures} Get From Dictionary ${result.json()} data
+ log ${result.content}
+ Set Global Variable ${pictures}
+
+get_repeat_proxy-order
+ #获取重复订单信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/repeat/proxy-order params=orderItemId=${orderItemId}&plateNumber=${carList}&settleWeight=14800&weighingDate=${datatime}&orderType=${orderType}&settlePrice=29466.6
+ ${records} Get From Dictionary ${reps.json()["data"]} records #获取重复订单列表
+ ${orderItemId_list} Create List
+ #sleep 0.5
+ FOR ${items} IN @{records}
+ ${orderItemId} Get From Dictionary ${items} orderItemId
+ Append To List ${orderItemId_list} '''${orderItemId}'''
+ END
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ Set Global Variable ${orderItemId_list}
+
+repeat_proxy-order
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ \ \ \ "orderItemId":"${orderItemId}", \ \ \ \ "remark":"${datatime}", \ \ \ \ "repeatOrderItem":${orderItemId_list} }
+ ${reps} Post On Session ZTBT recycle-service/admin/customer-service/confirm/repeat/proxy-order ${data.encode('utf-8')}
+
+weightnote
+ #提交磅单
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "deductedPoint":0, \ \ \ \ "imageUrl":[ \ \ \ \ \ \ \ \ "${pictures}" \ \ \ \ ], \ \ \ \ "scrapeOrderId":"", \ \ \ \ "orderItemId":"${orderItemId}", \ \ \ \ "unitPrice":"${paperCategoryPrice}", \ \ \ \ "paperCategoryId":"${categoryId}", \ \ \ \ "millSupplierId":"${supplier_id}", \ \ \ \ "millSupplierName":"${millSupplierName}", \ \ \ \ "settleUtiPriceIncludeTax":1.6608157894736841, \ \ \ \ "settleUtiPriceIncludeTaxType":"${settleUtiPriceIncludeTaxType}", \ \ \ \ "receivableAdjustMoney":"30", \ \ \ \ "refundSubsidy":0.002, \ \ \ \ "adjustMoney":"20", \ \ \ \ "collectionCharges":"${proxyPaySurcharge}", \ \ \ \ "advanceFund":"${advanceFund}", \ \ \ \ "transactionMainEnterpriseId":"${交易主体id}", \ \ \ \ "contractId":"${contractId}", \ \ \ \ "warehouseName":"${所属仓库}", \ \ \ \ "weightDay":"${datatime}", \ \ \ \ "settleDay":"${datatime}", \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "proxySellerSettleType":"${proxySellerSettleType}", \ \ \ \ "receivableSettlementRules":"${receivableSettlementRules}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "deductionNotes":"${datatime}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "settlePriceIncludeTaxSettleRules":"${settlePriceIncludeTaxSettleRules}", \ \ \ \ "settleUtiPrice":"${settleUtiPrice}", \ \ \ \ "netWeight":20000, \ \ \ \ "activitySettleType":null, \ \ \ \ "unitSurcharge":"${unitSurcharge}", \ \ \ \ "deliveryImageUrls":[ \ \ \ \ \ ], \ \ \ \ "publicSubsidies":0, \ \ \ \ "orderId":"${orderId}", \ \ \ \ "nonStandardPenalty_car":"", \ \ \ \ "settleWeight":10000, \ \ \ \ "deductedWeight":0, \ \ \ \ "orderType":1, \ \ \ \ "otherAmountList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"freightSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"contrabandPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":2, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":15, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"nonStandardPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ } \ \ \ \ ] }
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/proxy-sell/save/weightnote ${data.encode('utf-8')}
+ log ${reps.json()}
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]} weightNoteId #磅单编号
+ Set Global Variable ${weightNoteId}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ Set Global Variable ${datatime}
+
+audit_weightnote
+ #磅单审核接口
+ Create Session ZTBT ${URL} ${header}
+ ${repsonse} Post On Session ZTBT recycle-service/admin/customer-service/audit/weightnote/${weightNoteId}
+ log ${repsonse.json()}
+
+get_proxy-order
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ log ${reps.json()}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
diff --git a/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/3.2-Operation_audit.robot b/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/3.2-Operation_audit.robot
new file mode 100644
index 0000000..19ebb6c
--- /dev/null
+++ b/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/3.2-Operation_audit.robot
@@ -0,0 +1,80 @@
+*** Settings ***
+Documentation 运用审核-一次付款活动
+Library RequestsLibrary
+Library Collections
+Library DateTime
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_operation_list
+ #获取运营审核列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0
+ log ${reps.json()}
+
+get_paper-mill-order-by-orderItemId
+ #根据订单编号获取运营审核单
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0&orderItemId=${orderItemId}
+ log ${reps.json()}
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId #获取审核id
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]["records"][0]} weightNoteId #获取磅单id
+ Set Global Variable ${auditRequestId}
+ Set Global Variable ${weightNoteId}
+
+get_order-log-detail
+ #获取订单日志
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/order-log-detail params=orderId=${orderId}&weightNoteId=${weightNoteId}
+ log ${reps.json()}
+
+get_order-receipt-audit-details
+ #查看运营审核详情
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ log ${reps.json()}
+ ${auditRequestItemId} Get From Dictionary ${reps.json()["data"]["items"][0]} auditRequestItemId #审核项id
+ ${categoryName} Get From Dictionary ${reps.json()["data"]["items"][0]} categoryName #纸品品类名称
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]} paperCategoryId #纸厂品类id
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} netWeight #净重
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #计划回款日期
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]["items"][0]} plateNumber #车牌号
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${surcharge1} Evaluate ${unitSurcharge}*${netWeight}
+ ${surcharge2} Evaluate ${unitSurcharge}*${settleWeight}
+ ${surcharge} Set Variable If '${proxySellerSettleType}'=='0' ${surcharge1} ${surcharge2} #代卖费总额
+ ${paperMillPayAt} Set Variable If '${paperMillPayAt}'=='无账期' null ${paperMillPayAt} #纸厂账期
+ Set Global Variable ${auditRequestItemId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${datatime}
+
+order-receipt-audit-details
+ #b保存磅单信息
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ \ \ \ "auditRequestItemId":"${auditRequestItemId}", \ \ \ \ "categoryName":"${categoryName}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "paperMillPayAt":"${paperMillPayAt}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "settlementDate":"${datatime}", \ \ \ \ "weighingDate":"${datatime}", \ \ \ \ "settleWeight":"${settleWeight}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "fundSourceId":"${id}", \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "publicSubsidies":"${publicSubsidies}", \ \ \ \ "publicSubsidiesIncludeTax":0, \ \ \ \ "settleUnitPrice":"${settleUtiPrice}", \ \ \ \ "fundSourceName":"${name}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/edit/order-receipt-audit-details ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+get_order-log-detail2
+ #运营审核驳回操作日志
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/order-log-detail params=orderId=${orderId}&weightNoteId=${weightNoteId} &operationStatus=2
+ log ${reps.json()}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+operation_audit
+ #运营审核确认通过
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ "auditRequestId":"${auditRequestId}", \ \ \ \ "isPass":1, \ \ \ \ "remark":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/operation/audit ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ sleep 1
diff --git a/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/__init__.robot b/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/__init__.robot
new file mode 100644
index 0000000..e69de29
diff --git a/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/台账查询.txt b/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/台账查询.txt
new file mode 100644
index 0000000..2071449
--- /dev/null
+++ b/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/台账查询.txt
@@ -0,0 +1,21 @@
+*** Settings ***
+Library Collections
+Library RequestsLibrary
+
+*** Variables ***
+${URL} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+台账查询
+ #获取台账列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/parameter/get/parameter params=pageNum=1&pageSize=10&withdrawState=&state=&orderItemId=${orderItemId}
+ ${台账列表数据} Get From List ${reps.json()["data"]["records"]} 0 #获取台账列表数据
+ #Set Global Variable ${台账列表数据}
+ Should Be Equal As Numbers ${netWeight} ${reps.json()["data"]["records"][0]["netWeight"]}
+ Should Be Equal As Numbers ${unitSurcharge} ${reps.json()["data"]["records"][0]["unitSurcharge"]}
+ Should Be Equal As Numbers ${settleWeight} ${reps.json()["data"]["records"][0]["settleWeight"]}
+ Should Be Equal As Numbers ${settleUnitPrice} ${reps.json()["data"]["records"][0]["settleUtiPrice"]}
+ Should Be Equal As Numbers ${receivableAdjustMoney} ${reps.json()["data"]["records"][0]["receivableAdjustMoney"]}
+ Should Be Equal As Numbers ${adjustMoney} ${reps.json()["data"]["records"][0]["adjustMoney"]}
diff --git a/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/提交磅单.txt b/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/提交磅单.txt
new file mode 100644
index 0000000..6545de7
--- /dev/null
+++ b/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/提交磅单.txt
@@ -0,0 +1,172 @@
+*** Settings ***
+Library RequestsLibrary
+Library DateTime
+Library Collections
+
+*** Variables ***
+${URL} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+获取磅单详情
+ #查看订单列表详情
+ Create Session ZTBT ${URL} ${header}
+ #${data} Set Variable orderId=${orderId} orderItemId=${orderItemId}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #当前订单下单时的合同id
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} unitSurcharge #代卖费
+ ${proxySellerSettleType} Get From Dictionary ${reps.json()["data"]} proxySellerSettleType #代卖费结算方式
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]} paperCategoryId #纸厂品类ID
+ ${unitPrice} Get From Dictionary ${reps.json()["data"]} paperCategoryPrice #品类单价
+ ${publicSubsidies} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} publicSubsidies #公开补贴
+ ${millSupplierId} Get From Dictionary ${reps.json()["data"]} millSupplierId #纸厂供应商ID
+ ${paperMillSupplierName} Get From Dictionary ${reps.json()["data"]} paperMillSupplierName #纸厂供应商名称
+ ${publicSubsidies} Set Variable If '${publicSubsidies}'=='${null}' 0 ${publicSubsidies}
+ #${settleUtiPrice} Evaluate ${unitPrice}+${publicSubsidies} #结算单价
+ ${unitSurcharge} Set Variable If '${unitSurcharge}'=='${None}' 0 ${unitSurcharge}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ ${磅单id} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} id #获取磅单id
+ ${status} Get From Dictionary ${reps.json()["data"]} status
+ ${receivableAdjustMoney} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} receivableAdjustMoney #获取应收调节费
+ ${adjustMoney} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} adjustMoney #获取调节费
+ ${receivableAdjustMoney} Set Variable If '${receivableAdjustMoney}'=='${None}' 0 ${receivableAdjustMoney}
+ ${adjustMoney} Set Variable If '${adjustMoney}'=='${None}' 0 ${adjustMoney}
+ ${settleUtiPrice} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} settleUtiPrice #获取结算单价
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} netWeight #获取净重
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} settleWeight #获取结算重量
+ ${netWeight1} Evaluate ${netWeight}+30
+ FOR ${净重index} IN RANGE ${netWeight} 30
+ Exit For Loop If '${净重index}'=='${netWeight1}'
+ END
+ ${settleWeight1} Evaluate ${settleWeight}+30
+ FOR ${结算重量index} IN RANGE ${settleWeight} 30
+ Exit For Loop If '${结算重量index}'=='${settleWeight1}'
+ END
+ ${unitSurcharge1} Evaluate ${unitSurcharge}+0.001
+ FOR ${代卖费index} IN RANGE ${unitSurcharge} 100
+ Exit For Loop If '${代卖费index}'=='${unitSurcharge1}'
+ END
+ ${settleUtiPrice1} Evaluate ${settleUtiPrice}+0.1
+ FOR ${结算单价index} IN RANGE ${settleUtiPrice} 100
+ Exit For Loop If '${结算单价index}'=='${settleUtiPrice1}'
+ END
+ ${receivableAdjustMoney1} Evaluate ${receivableAdjustMoney}+10
+ FOR ${应收调节费index} IN RANGE ${receivableAdjustMoney} 500
+ Exit For Loop If '${应收调节费index}'=='${receivableAdjustMoney1}'
+ END
+ ${adjustMoney1} Evaluate ${adjustMoney}+10
+ FOR ${应收调节费index} IN RANGE ${adjustMoney} 500
+ Exit For Loop If '${应收调节费index}'=='${adjustMoney1}'
+ END
+ Set Global Variable ${contractId}
+ Set Global Variable ${unitSurcharge}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${settleUtiPrice1}
+ Set Global Variable ${unitPrice}
+ Set Global Variable ${publicSubsidies}
+ Set Global Variable ${millSupplierId}
+ Set Global Variable ${paperMillSupplierName}
+ Set Global Variable ${proxySellerSettleType}
+ Set Global Variable ${contractId}
+ Set Global Variable ${netWeight1}
+ Set Global Variable ${settleWeight1}
+ Set Global Variable ${磅单id}
+ Set Global Variable ${status}
+ Set Global Variable ${unitSurcharge1}
+ Set Global Variable ${adjustMoney1}
+ Set Global Variable ${receivableAdjustMoney1}
+
+weightnote
+ #驳回后重新提交磅单
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "deductedPoint":0, \ \ \ \ "imageUrl":[ \ \ \ \ \ \ \ \ "${pictures}" \ \ \ \ ], \ \ \ \ "orderItemId":"${orderItemId}", \ \ \ \ "unitPrice":"${unitPrice}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "millSupplierId":"${supplier_id}", \ \ \ \ "millSupplierName":"${millSupplierName}", \ \ \ \ "settleUtiPriceIncludeTax":2.04012, \ \ \ \ "settleUtiPriceIncludeTaxType":1, \ \ \ \ "receivableAdjustMoney":"${receivableAdjustMoney1}", \ \ \ \ "refundSubsidy":0.002, \ \ \ \ "adjustMoney":"${adjustMoney1}", \ \ \ \ "collectionCharges":"${proxyPaySurcharge}", \ \ \ \ "advanceFund":"${advanceFund}", \ \ \ \ "contractId":"${contractId}", \ \ \ \ "warehouseName":"${所属仓库}", \ \ \ \ "weightDay":"${datatime}", \ \ \ \ "settleDay":"${datatime}", \ \ \ \ "transactionMainEnterpriseId":"${交易主体id}", \ \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "proxySellerSettleType":"${proxySellerSettleType}", \ \ \ \ "receivableSettlementRules":"${receivableSettlementRules}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "deductionNotes":"${datatime}", \ \ \ \ "plateNumber":"${carList}", \ \ \ \ "settlePriceIncludeTaxSettleRules":"${settlePriceIncludeTaxSettleRules}", \ \ \ \ "settleUtiPrice":"${settleUtiPrice1}", \ \ \ \ "netWeight":"${netWeight1}", \ \ \ \ "activitySettleType":null, \ \ \ \ "unitSurcharge":"${unitSurcharge1}", \ \ \ \ "deliveryImageUrls":[ \ \ \ \ \ ], \ \ \ \ "publicSubsidies":0, \ \ \ \ "isSubsidyAndDeductIncludeTax":0, \ \ \ \ "orderId":"${orderId}", \ \ \ \ "settleWeight":"${settleWeight1}", \ \ \ \ "deductedWeight":2, \ \ \ \ "orderType":"${orderType}", \ \ \ \ "otherAmountList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"freightSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"contrabandPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"nonStandardPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ } \ \ \ \ ], \ \ \ \ "id":"${磅单id}" \ \ \ \ }
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/proxy-sell/update/weightnote ${data.encode('utf-8')}
+ log ${reps.json()["data"]}
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]} weightNoteId
+ Set Global Variable ${weightNoteId}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+获取上传磅单后的订单详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ ${settleUnitPrice} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} settleUtiPrice #获取结算单价
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} unitSurcharge #获取代卖费
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} netWeight #获取净重
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} settleWeight #获取结算重量
+ ${receivableAdjustMoney} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} receivableAdjustMoney #获取应收调节费
+ ${adjustMoney} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} adjustMoney #获取调节费
+ Set Global Variable ${settleUnitPrice}
+ Set Global Variable ${unitSurcharge}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${receivableAdjustMoney}
+ Set Global Variable ${adjustMoney}
+
+获取送货单详情
+ #获取订单详情信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId} &orderItemId=${orderItemId}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ ${paperMillId} Get From Dictionary ${reps.json()["data"]} paperMillId #纸厂id
+ ${paperCategoryPrice} Get From Dictionary ${reps.json()["data"]} paperCategoryPrice #品类价格
+ ${publicSubsidies} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} publicSubsidies #公开补贴
+ ${activitySettleType} Get From Dictionary ${reps.json()["data"]} activitySettleType #活动订单结算方式
+ ${proxySellerSettleType} Get From Dictionary ${reps.json()["data"]} proxySellerSettleType #代卖费结算方式
+ ${交易主体id} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseId #交易主体id
+ ${交易主体name} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseName #交易主体name
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]} unitSurcharge #代卖费单价
+ ${publicSubsidies} Set Variable If '${publicSubsidies}'=='${null}' 0 ${publicSubsidies}
+ ${settleUtiPrice}= Evaluate ${unitPrice}+${publicSubsidies} #结算单价
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ ${磅单id} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} id #获取磅单id
+ ${status} Get From Dictionary ${reps.json()["data"]} status
+ ${unitSurcharge3} Evaluate ${unitSurcharge}+0.001
+ FOR ${代卖费index} IN RANGE ${unitSurcharge} 100
+ Exit For Loop If '${代卖费index}'=='${unitSurcharge3}'
+ END
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} netWeight #获取净重
+ ${netWeight3} Evaluate ${netWeight}+300
+ FOR ${净重index} IN RANGE ${netWeight} 30
+ Exit For Loop If '${净重index}'=='${netWeight3}'
+ END
+ Set Global Variable ${contractId}
+ Set Global Variable ${paperMillId}
+ Set Global Variable ${paperCategoryPrice}
+ Set Global Variable ${publicSubsidies}
+ Set Global Variable ${activitySettleType}
+ Set Global Variable ${proxySellerSettleType}
+ Set Global Variable ${settleUtiPrice}
+ Set Global Variable ${交易主体id}
+ Set Global Variable ${交易主体name}
+ Set Global Variable ${unitSurcharge3}
+ Set Global Variable ${netWeight3}
+ Set Global Variable ${磅单id}
+ Set Global Variable ${status}
+
+上传送货单
+ #上传送货单
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "settleUtiPrice":"${settleUtiPrice}", \ \ \ \ "publicSubsidies":0, \ \ \ \ "netWeight":"${netWeight3}", \ \ \ \ "settleWeight":null, \ \ \ \ "unitSurcharge":${unitSurcharge3}, \ \ \ \ "transactionMainEnterpriseId":"${交易主体id}", \ \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "activitySettleType":"${activitySettleType}", \ \ \ \ "proxySellerSettleType":"${proxySellerSettleType}", \ \ \ \ "remark":null, \ \ \ \ "imageUrl":[ \ \ \ \ \ \ \ \ "${pictures}" \ \ \ \ ], \ \ \ \ "orderItemId":"${orderItemId}", \ \ \ \ "orderId":"${orderId}", \ \ \ \ "settleDay":"${datatime}", \ \ \ \ "settlePrice":0, \ \ \ \ "contractId":"${contractId}", \ \ \ \ "millSupplierId":"${supplier_id}", \ \ \ \ "millSupplierName":"${millSupplierName}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "orderType":"${orderType}", \ \ \ \ "weightDay":"${datatime}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "warehouseName":"${所属仓库}", \ \ \ \ "deductionNotes":"${datatime}", \ \ \ \ "receivableSettlementRules":"${receivableSettlementRules}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "otherAmountList":[ \ \ \ \ \ ], \ \ \ \ "unitPrice":"${paperCategoryPrice}", \ \ \ \ "id":"${磅单id}" \ \ \ \ \ }
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/proxy-sell/update/weightnote ${data.encode('utf-8')}
+ log ${reps.json()}
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]} weightNoteId #磅单编号
+ Set Global Variable ${weightNoteId}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ Set Global Variable ${datatime}
+
+获取上传送货单后的订单详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} netWeight #获取净重
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} unitSurcharge #获取代卖费
+ Set Global Variable ${netWeight}
+ Set Global Variable ${unitSurcharge}
+
+audit_weightnote
+ Create Session ZTBT ${URL} ${header}
+ ${repsonse} Post On Session ZTBT recycle-service/admin/customer-service/audit/weightnote/${weightNoteId}
+ log ${repsonse.json()}
diff --git a/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/运营审核驳回.txt b/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/运营审核驳回.txt
new file mode 100644
index 0000000..2098597
--- /dev/null
+++ b/001-Activeorder/2-Background_system(Test)/2.1-Consignment management/运营审核驳回.txt
@@ -0,0 +1,61 @@
+*** Settings ***
+Library RequestsLibrary
+Library DateTime
+Library Collections
+
+*** Variables ***
+${URL} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+get_operation_list
+ #获取运营审核列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0&orderItemId=&orderId=${orderId}
+ ${audit_status} Get From Dictionary ${reps.json()["data"]["records"][0]} status
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId
+ Set Global Variable ${audit_status}
+ Set Global Variable ${auditRequestId}
+
+get_order-receipt-audit-details
+ #查看运营审核详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ log ${reps.json()}
+ ${auditRequestItemId} Get From Dictionary ${reps.json()["data"]["items"][0]} auditRequestItemId #审核项id
+ ${categoryName} Get From Dictionary ${reps.json()["data"]["items"][0]} categoryName #纸品品类名称
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]} paperCategoryId #纸厂品类id
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} netWeight #净重
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #计划回款日期
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]["items"][0]} plateNumber #车牌号
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${settleWeight} Set Variable If '${settleWeight}'=='None' 0 ${settleWeight}
+ ${surcharge1} Evaluate ${unitSurcharge}*${netWeight}
+ ${surcharge2} Evaluate ${unitSurcharge}*${settleWeight}
+ ${surcharge} Set Variable If '${proxySellerSettleType}'=='0' ${surcharge1} ${surcharge2} #代卖费总额
+ ${paperMillPayAt} Set Variable If '${paperMillPayAt}'=='无账期' null ${paperMillPayAt} #纸厂账期
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]} auditRequestId
+ Set Global Variable ${auditRequestItemId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${surcharge}
+ Set Global Variable ${auditRequestId}
+
+保存磅单信息
+ #b保存磅单信息
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d #获取当前时间
+ ${data} Set Variable { \ \ \ \ "auditRequestItemId":"${auditRequestItemId}", \ \ \ \ "categoryName":"${categoryName}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "paperMillPayAt":"${paperMillPayAt}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "settlementDate":"${datatime}", \ \ \ \ "weighingDate":"${datatime}", \ \ \ \ "settleWeight":"${settleWeight}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "fundSourceId":"${id}", \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "publicSubsidies":"${publicSubsidies}", \ \ \ \ "publicSubsidiesIncludeTax":0, \ \ \ \ "settleUnitPrice":"${settleUtiPrice}", \ \ \ \ "fundSourceName":"${name}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/edit/order-receipt-audit-details ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+运营审核驳回
+ #运营审核驳回
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "auditRequestId":"${auditRequestId}", \ \ \ \ "isPass":2, \ \ \ \ "remark":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/operation/audit ${data.encode('utf-8')}
diff --git a/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/4-Financial_audit.robot b/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/4-Financial_audit.robot
new file mode 100644
index 0000000..ee4cd03
--- /dev/null
+++ b/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/4-Financial_audit.robot
@@ -0,0 +1,41 @@
+*** Settings ***
+Documentation 代卖应付
+Library RequestsLibrary
+Library Collections
+Resource 财务审核驳回.txt
+Resource 运营审核通过.txt
+Resource 台账查询.txt
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${url} http://api-ops-psc-test.qniao.cn
+${URL1} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_list
+ #获取财务审核列表
+ Create Session ZTBT ${url} ${header}
+ ${reps} Get On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/get/list params=pageNum=1&pageSize=10&status=&orderId=&orderItemId=${orderItemId}
+ ${auditedTime} Get From Dictionary ${reps.json()["data"]["records"][0]} auditedTime #财务第一次确认结算时间
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ #Set Global Variable ${auditedTime}
+
+get_order-log-detail
+ #财务审核驳回操作记录
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/order-log-detail params=orderId=${orderId}&weightNoteId=${weightNoteId}&operationStatus=3
+
+paper-mill-order-receipt-proof-request_audit
+ #财务审核确认通过
+ Create Session ZTBT ${url} ${header}
+ ${data} Set Variable {"auditRequestId":"${auditRequestId}","adminId":null,"isPass":1,"remark":"${datatime}" }
+ ${reps} Post On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/audit ${data.encode('utf-8')}
+ log ${reps.json()}
+ sleep 1
+
+paper-mill-order-receipt-proof-request_settle
+ #确认结算
+ Create Session ZTBT ${url} ${header}
+ ${data} Set Variable { \ \ \ \ "id":"${auditRequestId}", \ \ \ \ "adminId":null }
+ ${reps} Post On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/settle ${data.encode('utf-8')}
+ sleep 1
diff --git a/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/5-Sales_receivables.robot b/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/5-Sales_receivables.robot
new file mode 100644
index 0000000..3ebbe95
--- /dev/null
+++ b/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/5-Sales_receivables.robot
@@ -0,0 +1,36 @@
+*** Settings ***
+Documentation 代卖应收
+Library RequestsLibrary
+Library Collections
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_paper-payment-order-list
+ #通过订单编号获取代卖应收列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-payment-order-list params=pageNum=1&pageSize=10&orderId=${orderId}
+ ${paymentOrderId} Get From Dictionary ${reps.json()["data"]["records"][0]} id #回款单号
+ log ${reps.json()}
+ Set Global Variable ${paymentOrderId}
+
+get_order-receipt-audit-details
+ #代卖应收详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ ${receivablePriceIncludeTax} Get From Dictionary ${reps.json()["data"]["items"][0]} receivablePriceIncludeTax
+ #${receivablePrice} Get From Dictionary ${reps.json()["data"]["items"][0]} receivablePrice #获取应收金额
+ ${noReceivablePrice} Get From Dictionary ${reps.json()["data"]["items"][0]} noReceivablePrice #获取未收金额
+ #Set Global Variable ${receivablePrice}
+ Set Global Variable ${receivablePriceIncludeTax}
+ Set Global Variable ${noReceivablePrice}
+
+update_payment-order-status
+ #确认回款操作
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ \ \ \ "paymentOrderId":"${paymentOrderId}", \ \ \ \ "receivablePrice":"${receivablePriceIncludeTax}", \ \ \ \ "paidPrice":"${receivablePriceIncludeTax}", \ \ \ \ "noReceiveblePrice":"${noReceivablePrice}", \ \ \ \ "bankFlowNo":null, \ \ \ \ "paymentAdjustmentFee":null, \ \ \ \ "returnPayDate":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/update/payment-order-status ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ sleep 1
diff --git a/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/台账查询.txt b/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/台账查询.txt
new file mode 100644
index 0000000..64abf98
--- /dev/null
+++ b/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/台账查询.txt
@@ -0,0 +1,20 @@
+*** Settings ***
+Library Collections
+Library RequestsLibrary
+
+*** Variables ***
+${URL1} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+台账查询
+ #获取台账列表
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/parameter/get/parameter params=pageNum=1&pageSize=10&withdrawState=&state=&orderItemId=${orderItemId}
+ ${台账列表数据} Get From List ${reps.json()["data"]["records"]} 0 #获取台账列表数据
+ #Set Global Variable ${台账列表数据}
+ #${receivableAdjustMoney1} Get From Dictionary ${reps.json()["data"]["records"][0]} receivableAdjustMoney #获取应收调节费
+ #${receivableAdjustMoney1} Set Variable If '${receivableAdjustMoney}'=='None' Should Not Be Equal As Numbers ${receivableAdjustMoney} ${receivableAdjustMoney1}
+ #Should Be Equal As Numbers ${receivableAdjustMoney} ${reps.json()["data"]["records"][0]["receivableAdjustMoney"]} #对比应收调节费
+ Should Be Equal As Numbers ${noReceivablePrice} ${reps.json()["data"]["records"][0]["noReceivablePrice"]} #对比未收款金额
+ Should Be Equal As Strings ${paperMillPayAt} ${reps.json()["data"]["records"][0]["paperMillPayAt"]} #对比预计回款日期
diff --git a/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/财务审核驳回.txt b/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/财务审核驳回.txt
new file mode 100644
index 0000000..d9f1ba8
--- /dev/null
+++ b/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/财务审核驳回.txt
@@ -0,0 +1,30 @@
+*** Settings ***
+Library Collections
+Library DateTime
+Library RequestsLibrary
+
+*** Variables ***
+${URL1} http://api-ops-ztb-test.qniao.cn
+${url} http://api-ops-psc-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+获取财务审核列表
+ #获取财务审核列表
+ Create Session ZTBT ${url} ${header}
+ ${reps} Get On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/get/list params=pageNum=1&pageSize=10&status=&orderId=&orderItemId=${orderItemId}
+ #${auditedTime} Get From Dictionary ${reps.json()["data"]["records"][0]} auditedTime #财务第一次确认结算时间
+ ${staus} Get From Dictionary ${reps.json()["data"]["records"][0]} status #获取审核状态
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ #Set Global Variable ${auditedTime}
+ Set Global Variable ${staus}
+ Set Global Variable ${auditRequestId}
+
+财务驳回
+ #财务审核驳回
+ Create Session ZTBT ${url} ${header}
+ ${data} Set Variable {"auditRequestId":"${auditRequestId}","adminId":null,"isPass":2,"remark":"${datatime}" }
+ ${reps} Post On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/audit ${data.encode('utf-8')}
+ log ${reps.json()}
+ sleep 1
diff --git a/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/运营审核通过.txt b/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/运营审核通过.txt
new file mode 100644
index 0000000..74be8e4
--- /dev/null
+++ b/001-Activeorder/2-Background_system(Test)/3-Withdrawal_application/运营审核通过.txt
@@ -0,0 +1,72 @@
+*** Settings ***
+Library RequestsLibrary
+Library DateTime
+Library Collections
+
+*** Variables ***
+${URL1} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+get_operation_list
+ #获取运营审核列表
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0&orderItemId=&orderId=${orderId}
+ ${audit_status} Get From Dictionary ${reps.json()["data"]["records"][0]} status
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId
+ Set Global Variable ${audit_status}
+ Set Global Variable ${auditRequestId}
+
+get_order-receipt-audit-details
+ #查看运营审核详情
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ log ${reps.json()}
+ ${auditRequestItemId} Get From Dictionary ${reps.json()["data"]["items"][0]} auditRequestItemId #审核项id
+ ${categoryName} Get From Dictionary ${reps.json()["data"]["items"][0]} categoryName #纸品品类名称
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]["items"][0]} paperCategoryId #纸厂品类id
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} netWeight #净重
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #计划回款日期
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]["items"][0]} plateNumber #车牌号
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${settleWeight} Set Variable If '${settleWeight}'=='None' 0 ${settleWeight}
+ ${surcharge1} Evaluate ${unitSurcharge}*${netWeight}
+ ${surcharge2} Evaluate ${unitSurcharge}*${settleWeight}
+ ${surcharge} Set Variable If '${proxySellerSettleType}'=='0' ${surcharge1} ${surcharge2} #代卖费总额
+ ${paperMillPayAt} Set Variable If '${paperMillPayAt}'=='无账期' null ${paperMillPayAt} #纸厂账期
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]} auditRequestId
+ Set Global Variable ${auditRequestItemId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${surcharge}
+ Set Global Variable ${auditRequestId}
+
+order-receipt-audit-details
+ #b保存磅单信息
+ Create Session ZTBT ${URL1} ${header}
+ ${data} Set Variable { \ \ \ \ "auditRequestItemId":"${auditRequestItemId}", \ \ \ \ "categoryName":"${categoryName}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "paperMillPayAt":"${paperMillPayAt}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "settlementDate":"${datatime}", \ \ \ \ "weighingDate":"${datatime}", \ \ \ \ "settleWeight":"${settleWeight}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "fundSourceId":"${id}", \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "publicSubsidies":"${publicSubsidies}", \ \ \ \ "publicSubsidiesIncludeTax":0, \ \ \ \ "settleUnitPrice":"${settleUtiPrice}", \ \ \ \ "fundSourceName":"${name}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/edit/order-receipt-audit-details ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+运营审核通过
+ #运营审核通过
+ Create Session ZTBT ${URL1} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "auditRequestId":"${auditRequestId}", \ \ \ \ "isPass":1, \ \ \ \ "remark":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/operation/audit ${data.encode('utf-8')}
+
+运营审核后详情
+ #查看运营审核详情
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ ${noReceivablePrice} Get From Dictionary ${reps.json()["data"]["items"][0]} noReceivablePrice #获取未收款金额
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #获取计划回款日期
+ ${receivableAdjustMoney} Get From Dictionary ${reps.json()["data"]["items"][0]} receivableAdjustMoney #获取应收调节费
+ #${noReceivablePrice} Evaluate ${noReceivablePrice}+1
+ Set Global Variable ${noReceivablePrice}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${receivableAdjustMoney}
diff --git a/002-Activeorder/1-Client(Test)/1-APPlogin(Test).robot b/002-Activeorder/1-Client(Test)/1-APPlogin(Test).robot
new file mode 100644
index 0000000..5e7cc34
--- /dev/null
+++ b/002-Activeorder/1-Client(Test)/1-APPlogin(Test).robot
@@ -0,0 +1,37 @@
+*** Settings ***
+Library RequestsLibrary
+Library Collections
+Library urllib3
+Library DatabaseLibrary
+
+*** Variables ***
+${header} {'content-type':'application/json','X-APP-ID':'470236309865238528'}
+${url} http://api-client-ztb-test.qniao.cn
+
+*** Test Cases ***
+userlogin
+ [Setup]
+ #验证码登录
+ Disable Warnings
+ Create Session ZTBT https://api-client-uec-test.qniao.cn ${header}
+ ${data} Create Dictionary account=18888888888 captcha=888888 accountType=2
+ ${account} Set Variable 18888888888
+ #${data} Set Variable {"accountType":2,"account":"${account}","captcha":888888}
+ ${respones} POST On Session ZTBT uec/authorize/by-captcha json=${data}
+ log ${respones.status_code}
+ log ${respones.json()}
+ ${token} Get From Dictionary ${respones.json()["data"]} token
+ Set Global Variable ${token}
+ Set Global Variable ${account}
+ [Teardown]
+
+login-token
+ #${header} Create Dictionary content-type=application/json X-APP-ID=470236309865238528
+ Create Session ZTBT ${url} ${header}
+ ${token1} Create Dictionary loginToken=${token}
+ ${reps} Post On Session ZTBT recycle-user-center/authorize/get/product-line-token/by/login-token json=${token1}
+ ${gettoken} Get From Dictionary ${reps.json()["data"]} token #获取token
+ ${userId} Get From Dictionary ${reps.json()["data"]} userId #获取用户id
+ log ${reps.json()["data"]["token"]}
+ Set Global Variable ${gettoken}
+ Set Global Variable ${userId}
diff --git a/002-Activeorder/1-Client(Test)/2.3createActiveorder-2.robot b/002-Activeorder/1-Client(Test)/2.3createActiveorder-2.robot
new file mode 100644
index 0000000..6956ad3
--- /dev/null
+++ b/002-Activeorder/1-Client(Test)/2.3createActiveorder-2.robot
@@ -0,0 +1,74 @@
+*** Settings ***
+Library DateTime
+Library Collections
+Library RequestsLibrary
+
+*** Variables ***
+${url} http://api-client-ztb-test.qniao.cn
+${headers} {'content-type':'application/json','X-APP-ID':'470236309865238528','Authorization':'QNT ${gettoken}'}
+
+*** Test Cases ***
+proxy-sell-activity_list
+ #获取活动代卖列表
+ Create Session ZTBT ${url} ${headers}
+ ${repsponse} Get On Session ZTBT recycle-service/proxy-sell-activity/list params=pageNum=1&pageSize=15
+ ${records} Get From Dictionary ${repsponse.json()["data"]} records #获取代卖活动列表
+ FOR ${item} IN @{records}
+ ${activityName} Get From Dictionary ${item} activityName #获取活动名称
+ ${paperCategoryList} Get From Dictionary ${item} paperCategoryList #获取纸厂品类
+ ${paperMillId} Get From Dictionary ${item} paperMillId #获取纸厂id
+ ${activityId} Get From Dictionary ${item} activityId #获取活动id
+ Exit For Loop If '${activityName}'=='Ceshi_factory--两次'
+ END
+ ${Category_value} Evaluate random.choice(${paperCategoryList}) random #获取纸品
+ log to console \nvalue: ${Category_value}
+ ${categoryId} Get From Dictionary ${Category_value} categoryId #获取纸品id
+ ${categoryName} Get From Dictionary ${Category_value} categoryName #获取纸品名称
+ ${unitPrice} Get From Dictionary ${Category_value} unitPrice #获取纸品价格
+ Set Global Variable ${paperMillId}
+ Set Global Variable ${activityId}
+ Set Global Variable ${categoryId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${unitPrice}
+
+get-carinfo
+ #获取使用过的车辆信息
+ #${header} Create Dictionary content-type=application/json X-APP-ID=470236309865238528 Authorization=${gettoken}
+ Create Session get-carinfo ${url} ${headers}
+ ${reps} Get On Session get-carinfo recycle-service/proxy-sell/get/his-car-info
+ log ${reps.json()}
+ ${carNumber} Get From Dictionary ${reps.json()["data"]} records #车辆列表
+ ${plateNumber_value} Evaluate random.sample(${carNumber},1) random
+ log to console \nvalue:${plateNumber_value}
+ ${plateNumber1} Get From Dictionary ${plateNumber_value[0]} plateNumber #车辆信息1
+ #${plateNumber2} Get From Dictionary ${plateNumber_value[1]} plateNumber #车辆信息2
+ Set Global Variable ${plateNumber1}
+ #Set Global Variable ${plateNumber2}
+
+get_paper-mill-paper-category-price-details
+ #获取纸厂详情
+ Create Session ZTBT ${url} ${headers}
+ ${reps} Get On Session ZTBT recycle-service/get/paper-mill-paper-category-price-details/${paperMillId}
+ log ${reps.json()}
+
+get_relation
+ #创建用户和业务归属人关系
+ Create Session ZTBT ${url} ${headers}
+ ${reps} Get On Session ZTBT recycle-service/proxy-sell/get/relation
+ ${bizUserId} Get From Dictionary ${reps.json()["data"]} bizUserId #业务归属人id
+ ${cusormerId} Get From Dictionary ${reps.json()["data"]} cusormerId #用户id
+ ${customerName} Get From Dictionary ${reps.json()["data"]} customerName #用户名称
+ Set Global Variable ${bizUserId}
+ Set Global Variable ${cusormerId}
+ Set Global Variable ${customerName}
+
+create_order
+ #创建代卖活动订单-2次付款
+ Create Session ZTBT ${url} ${headers}
+ ${datatime} get current date result_format=%Y-%m-%d
+ ${order_data} Set Variable { \ \ \ \ "paperCategoryId":"${categoryId}", \ \ \ \ "unitPrice":"${unitPrice}", \ \ \ \ "totalEstimatedWeight":30000, \ \ \ \ "activityId":"${activityId}", \ \ \ \ "customerName":"${customerName}", \ \ \ \ "deliveryTime":"${datatime}", \ \ \ \ "carInfos":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "plateNumber":"${plateNumber1}" \ \ \ \ \ \ \ \ } \ \ \ \ ] }
+ ${reps} Post On Session ZTBT recycle-service/proxy-sell/create/order ${order_data.encode('utf-8')}
+ log ${reps.json()}
+ ${orderId} Get From Dictionary ${reps.json()["data"]} orderId #获取订单编号
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ Set Global Variable ${orderId}
diff --git a/002-Activeorder/1-Client(Test)/__init__.robot b/002-Activeorder/1-Client(Test)/__init__.robot
new file mode 100644
index 0000000..4d46599
--- /dev/null
+++ b/002-Activeorder/1-Client(Test)/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Test Setup
diff --git a/002-Activeorder/2-Background_system(Test)/1-WebLogin/weblogin.robot b/002-Activeorder/2-Background_system(Test)/1-WebLogin/weblogin.robot
new file mode 100644
index 0000000..f08ffc4
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/1-WebLogin/weblogin.robot
@@ -0,0 +1,21 @@
+*** Settings ***
+Library RequestsLibrary
+
+*** Test Cases ***
+pwlogin
+ ${header} Create Dictionary Content-Type=application/x-www-form-urlencoded X-APP-ID=470236309865238555
+ Create Session ZTBT http://api-ops-ztb-test.qniao.cn ${header}
+ &{data} Create Dictionary username=laiyonglan@qniao.cn password=qn123456
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/login data=${data}
+ log ${reps.json()}
+ ${gettoken} Set Variable Token 6b08add42d6bcf73abb935b2adf83525
+ Should Be Equal As Strings ${reps.json()["message"]} 登陆成功
+ Set Global Variable ${gettoken}
+
+login-info
+ ${header} Create Dictionary X-APP-ID=470236309865238555 Authorization=Token 6b08add42d6bcf73abb935b2adf83525
+ Create Session login-info http://api-ops-ztb-test.qniao.cn ${header}
+ ${reps_data} Get On Session login-info recycle-service/admin/employee/get/login-info
+ log ${reps_data}
+ Should Be Equal As Strings ${reps_data.json()["message"]} successful
diff --git a/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/1-appointment.robot b/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/1-appointment.robot
new file mode 100644
index 0000000..60ad6a2
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/1-appointment.robot
@@ -0,0 +1,57 @@
+*** Settings ***
+Documentation 预约送货
+Library RequestsLibrary
+Library Collections
+Library DateTime
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_paper-mill-order-reservation-list
+ Create Session ZTBT ${URL} ${header}
+ ${reps_data} Get On Session ZTBT recycle-service/admin/customer-service/get/paper-mill-order-reservation-list params=pageNum=1&pageSize=10&status=&orderId=${orderId}
+ log ${reps_data.json()}
+ #获取订单编号${orderId}、纸厂id${paperMillId}、订单类型${orderType}
+ ${orderId} Get From Dictionary ${reps_data.json()["data"]["records"][0]} orderId #订单编号
+ ${paperMillId} Get From Dictionary ${reps_data.json()["data"]["records"][0]} paperMillId #纸厂id
+ ${id} Get From Dictionary ${reps_data.json()["data"]["records"][0]} id #预约id
+ ${orderType} Get From Dictionary ${reps_data.json()["data"]["records"][0]} orderType #订单类型
+ ${carNoList} Get From Dictionary ${reps_data.json()["data"]["records"][0]} carNoList #车辆信息列表
+ ${paperMillName} Get From Dictionary ${reps_data.json()["data"]["records"][0]} paperMillName #纸厂名称
+ ${sellerReservationDate} Get From Dictionary ${reps_data.json()["data"]["records"][0]} sellerReservationDate #送货时间
+ #随机获取车辆信息
+ ${carList} Evaluate random.choice(${carNoList}) random
+ log to console \nvalue:${carList}
+ Should Be Equal As Strings ${reps_data.json()["message"]} successful
+ Set Global Variable ${orderId}
+ Set Global Variable ${paperMillId}
+ Set Global Variable ${id}
+ Set Global Variable ${paperMillName}
+ Set Global Variable ${sellerReservationDate}
+ Set Global Variable ${orderType}
+ Set Global Variable ${carList}
+
+get-supplier
+ Create Session ZTBT http://api-ops-ztb-test.qniao.cn ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/paper-mill-merchant/${paperMillId} params=paperMillId=${paperMillId}
+ log ${reps.json()}
+ #获取供应商id和name
+ ${data} Get From Dictionary ${reps.json()} data
+ ${value} Evaluate random.choice(${data}) random
+ log to console \nvalue: ${value}
+ ${supplier_id} Get From Dictionary ${value} id #供应商id
+ ${millSupplierName} Get From Dictionary ${value} name #供应商名称
+ Set Global Variable ${supplier_id}
+ Set Global Variable ${millSupplierName}
+
+Submit-appointment
+ #${headers} Create Dictionary Content-Type=application/json X-APP-ID=470236309865238555 Authorization=Token 6b08add42d6bcf73abb935b2adf83525
+ #提交预约信息
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} get current date result_format=%Y-%m-%d
+ ${data} Set Variable {"attention":"${orderId}","buyerReservationDate":"${datatime}", "id":"${id}","millDeliveryOrderId":"${orderId}","millSupplierId":"${supplier_id}","millSupplierName":"${millSupplierName}","proxySellerSettleType":0,"scrapeOrderId":"${orderId}"}
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/customer-service/update/reservation ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
diff --git a/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/2.3-ActiveUpload-deliverynote.robot b/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/2.3-ActiveUpload-deliverynote.robot
new file mode 100644
index 0000000..f577cc8
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/2.3-ActiveUpload-deliverynote.robot
@@ -0,0 +1,190 @@
+*** Settings ***
+Documentation 上次送货单-两次付款活动
+Library DateTime
+Library RequestsLibrary
+Library Collections
+Library requests
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get-order-item-list
+ #查找预约的订单项列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order-item-list params=orderType=${orderType} &pageNum=1&pageSize=10&status=51&orderId=${orderId}
+ log ${reps.json()}
+ ${records} Get From Dictionary ${reps.json()["data"]} records #获取订单列表
+ ${orderItemId_value} Evaluate random.choice(${records}) random #随机获取订单信息
+ log to console \nvalue: ${orderItemId_value}
+ ${orderItemId} Get From Dictionary ${orderItemId_value} orderItemId #订单项编号
+ Set Global Variable ${orderItemId}
+ #Should Be Equal As Strings ${reps.json()["data"]["records"][0]} orderId=${orderId}
+
+get-order-item-details
+ #获取订单详情信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId} &orderItemId=${orderItemId}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ ${paperMillId} Get From Dictionary ${reps.json()["data"]} paperMillId #纸厂id
+ ${paperCategoryPrice} Get From Dictionary ${reps.json()["data"]} paperCategoryPrice #品类价格
+ ${publicSubsidies} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} publicSubsidies #公开补贴
+ ${activitySettleType} Get From Dictionary ${reps.json()["data"]} activitySettleType #活动订单结算方式
+ ${proxySellerSettleType} Get From Dictionary ${reps.json()["data"]} proxySellerSettleType #代卖费结算方式
+ ${交易主体id} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseId #交易主体id
+ ${交易主体name} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseName #交易主体name
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]} unitSurcharge #代卖费单价
+ ${publicSubsidies} Set Variable If '${publicSubsidies}'=='${null}' 0 ${publicSubsidies}
+ ${settleUtiPrice}= Evaluate ${unitPrice}+${publicSubsidies} #结算单价
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ Set Global Variable ${contractId}
+ Set Global Variable ${paperMillId}
+ Set Global Variable ${paperCategoryPrice}
+ Set Global Variable ${publicSubsidies}
+ Set Global Variable ${activitySettleType}
+ Set Global Variable ${proxySellerSettleType}
+ Set Global Variable ${settleUtiPrice}
+ Set Global Variable ${交易主体id}
+ Set Global Variable ${交易主体name}
+ Set Global Variable ${unitSurcharge}
+
+get_delivery-info
+ #获取订单名片信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/proxy-sell/get/proxy-order/delivery-info/${orderItemId}
+ log ${reps.json()}
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]} plateNumber #车牌号
+ ${settleUtiPrice} Get From Dictionary ${reps.json()["data"]} settleUtiPrice #结算单价
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleUtiPrice}
+
+get_contract_by_id
+ #获取下单时绑定的合同
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/contract/get/detail-by-id params=id=${contractId}
+ log ${reps.json()}
+ #获取垫资费、企业ID、应收金额结算规则、含税结算单价结算规则
+ ${advanceFund} Get From Dictionary ${reps.json()["data"]} advanceFund #垫资费
+ ${accountPeriod} Get From Dictionary ${reps.json()["data"]} accountPeriod #账期
+ ${buyerEnterpriseId} Get From Dictionary ${reps.json()["data"]} buyerEnterpriseId #企业id
+ ${settlePriceIncludeTaxSettleRules} Get From Dictionary ${reps.json()["data"]} settlePriceIncludeTaxSettleRules #含税结算单价结算规则
+ ${taxRefundRate} Get From Dictionary ${reps.json()["data"]} taxRefundRate #税点
+ ${proxyPaySurcharge} Get From Dictionary ${reps.json()["data"]} proxyPaySurcharge #代收费
+ ${hasInvoice} Get From Dictionary ${reps.json()["data"]} hasInvoice #是否开票
+ ${accountPeriodType} Get From Dictionary ${reps.json()["data"]} accountPeriodType #账期类型
+ ${isSubsidyAndDeductIncludeTax} Get From Dictionary ${reps.json()["data"]} isSubsidyAndDeductIncludeTax #纸厂补贴是否含税
+ ${receivableSettlementRules} Get From Dictionary ${reps.json()["data"]} settleRules #应收金额结算规则
+ ${settlePriceIncludeTaxSettleRules} Get From Dictionary ${reps.json()["data"]} settlePriceIncludeTaxSettleRules #含税结算单价结算规则
+ ${advanceFund} Set Variable If '${advanceFund}'=='${None}' 0 ${advanceFund}
+ ${proxyPaySurcharge} Set Variable If '${proxyPaySurcharge}'=='${None}' 0 ${proxyPaySurcharge}
+ Set Global Variable ${advanceFund}
+ Set Global Variable ${accountPeriod}
+ Set Global Variable ${buyerEnterpriseId}
+ Set Global Variable ${taxRefundRate}
+ Set Global Variable ${proxyPaySurcharge}
+ Set Global Variable ${hasInvoice}
+ Set Global Variable ${accountPeriodType}
+ Set Global Variable ${settlePriceIncludeTaxSettleRules}
+ Set Global Variable ${isSubsidyAndDeductIncludeTax}
+ Set Global Variable ${receivableSettlementRules}
+ Set Global Variable ${settlePriceIncludeTaxSettleRules}
+
+get-contract-list
+ #获取订单纸厂的所有合同信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT /recycle-service/admin/contract/get/selectable-contract-list params=orderItemId=${orderItemId}
+ log ${reps.json()}
+
+get-supplier
+ #获取纸厂供应商
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/paper-mill-merchant/${paperMillId} params=paperMillId=${paperMillId}
+ log ${reps.json()}
+
+get-Source of funds
+ #获取资金来源
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/fund-source/get/list
+ log ${reps.json()}
+ ${data} Get From Dictionary ${reps.json()} data
+ FOR ${item} IN @{data}
+ log ${item}
+ ${isDefault} Get From Dictionary ${item} isDefault #获取启用状态
+ ${name} Get From Dictionary ${item} name #获取name
+ ${id} Get From Dictionary ${item} id #获取id
+ Exit For Loop If '${isDefault}'=='1'
+ END
+ Set Global Variable ${name}
+ Set Global Variable ${id}
+
+get-Warehouse
+ #获取所属仓库
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/transaction-main-enterprise/get/warehouse-name
+ ${仓库} Get From Dictionary ${reps.json()} data
+ #随机获取仓库
+ ${所属仓库} Evaluate random.choice(${仓库}) random
+ log to console \nvalue:${所属仓库}
+ Set Global Variable ${所属仓库}
+
+get_proxy-order_delivery-info
+ #获取订单名片信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/proxy-sell/get/proxy-order/delivery-info/${orderItemId}
+ log ${reps.json()}
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]} plateNumber #车牌号
+ ${settleUtiPrice} Get From Dictionary ${reps.json()["data"]} settleUtiPrice #结算单价
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleUtiPrice}
+
+get_paper-mill-category
+ #获取当前纸厂的所有纸品品类
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/paperMill/get/paper-mill-category/${paperMillId} params=id=${paperMillId}
+ log ${reps.json()}
+
+Upload_pictures
+ #上传图片
+ #${dict} Create Dictionary Content-Type=image/jpeg filename=20210803.jpg
+ #Create Session ZTBT ${URL} ${dict}
+ ${filepath} Evaluate open('./20210803.jpg','rb')
+ ${image} Evaluate open('./20210803.jpg','rb')
+ ${file} Create Dictionary filepath=${filepath} image=${image}
+ Create Session ZTBT ${URL}
+ log ${file}
+ ${result} Post On Session ZTBT recycle-user-center/upload/image files=${file}
+ ${pictures} Get From Dictionary ${result.json()} data
+ log ${result.content}
+ Set Global Variable ${pictures}
+
+get_repeat/proxy-order
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/repeat/proxy-order params=orderItemId=${orderItemId} &plateNumber=${plateNumber} &netWeight=30000&weighingDate=${datatime}&orderType=3
+ log ${reps.json()}
+
+weightnote
+ #提交磅单
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "settleUtiPrice":"${settleUtiPrice}", \ \ \ \ "publicSubsidies":0, \ \ \ \ "netWeight":15500, \ \ \ \ "settleWeight":null, \ \ \ \ "unitSurcharge":${unitSurcharge}, \ \ \ \ "transactionMainEnterpriseId":"${交易主体id}", \ \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "activitySettleType":"${activitySettleType}", \ \ \ \ "proxySellerSettleType":"${proxySellerSettleType}", \ \ \ \ "remark":null, \ \ \ \ "imageUrl":[ \ \ \ \ \ \ \ \ "${pictures}" \ \ \ \ ], \ \ \ \ "orderItemId":"${orderItemId}", \ \ \ \ "orderId":"${orderId}", \ \ \ \ "settleDay":"${datatime}", \ \ \ \ "settlePrice":0, \ \ \ \ "contractId":"${contractId}", \ \ \ \ "millSupplierId":"${supplier_id}", \ \ \ \ "millSupplierName":"${millSupplierName}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "orderType":"${orderType}", \ \ \ \ "weightDay":"${datatime}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "warehouseName":"${所属仓库}", \ \ \ \ "deductionNotes":"${datatime}", \ \ \ \ "receivableSettlementRules":"${receivableSettlementRules}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "otherAmountList":[ \ \ \ \ \ ], \ \ \ \ "unitPrice":"${paperCategoryPrice}" }
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/proxy-sell/save/weightnote ${data.encode('utf-8')}
+ log ${reps.json()}
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]} weightNoteId #磅单编号
+ Set Global Variable ${weightNoteId}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ Set Global Variable ${datatime}
+
+audit_weightnote
+ #磅单审核接口
+ Create Session ZTBT ${URL} ${header}
+ ${repsonse} Post On Session ZTBT recycle-service/admin/customer-service/audit/weightnote/${weightNoteId}
+ log ${repsonse.json()}
+
+get_proxy-order
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ log ${reps.json()}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
diff --git a/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/3.3-Operation_audit.robot b/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/3.3-Operation_audit.robot
new file mode 100644
index 0000000..3555a8a
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/3.3-Operation_audit.robot
@@ -0,0 +1,135 @@
+*** Settings ***
+Documentation 运营审核-两次付款活动
+Library RequestsLibrary
+Library Collections
+Library DateTime
+Resource 提交磅单.txt
+Resource 运营审核驳回.txt
+Resource 台账查询.txt
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_operation_list
+ #获取运营审核列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0
+ log ${reps.json()}
+
+get_paper-mill-order-by-orderItemId
+ #根据订单编号获取运营审核单
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0&orderItemId=${orderItemId}
+ log ${reps.json()}
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId #获取审核id
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]["records"][0]} weightNoteId #获取磅单id
+ Set Global Variable ${auditRequestId}
+ Set Global Variable ${weightNoteId}
+
+get_order-log-detail
+ #获取订单日志
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/order-log-detail params=orderId=${orderId}&weightNoteId=${weightNoteId}
+ log ${reps.json()}
+
+get_order-receipt-audit-details
+ #查看运营审核详情
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ log ${reps.json()}
+ ${auditRequestItemId} Get From Dictionary ${reps.json()["data"]["items"][0]} auditRequestItemId #审核项id
+ ${categoryName} Get From Dictionary ${reps.json()["data"]["items"][0]} categoryName #纸品品类名称
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]} paperCategoryId #纸厂品类id
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} netWeight #净重
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #计划回款日期
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]["items"][0]} plateNumber #车牌号
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${paperMillPayAt} Set Variable If '${paperMillPayAt}'=='无账期' null ${paperMillPayAt} #纸厂账期
+ ${settleWeight} Set Variable If '${settleWeight}'=='None' 0 ${settleWeight} #结算重量
+ Set Global Variable ${auditRequestItemId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${datatime}
+
+order-receipt-audit-details
+ #b保存磅单信息
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ \ \ \ "auditRequestItemId":"${auditRequestItemId}", \ \ \ \ "categoryName":"${categoryName}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "paperMillPayAt":"${paperMillPayAt}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "settlementDate":"${datatime}", \ \ \ \ "weighingDate":"${datatime}", \ \ \ \ "settleWeight":"${settleWeight}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "fundSourceId":"${id}", \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "publicSubsidies":"${publicSubsidies}", \ \ \ \ "publicSubsidiesIncludeTax":0, \ \ \ \ "settleUnitPrice":"${settleUtiPrice}", \ \ \ \ "fundSourceName":"${name}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/edit/order-receipt-audit-details ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+get_order-log-detail2
+ #运营审核驳回操作日志
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/order-log-detail params=orderId=${orderId}&weightNoteId=${weightNoteId} &operationStatus=2
+ log ${reps.json()}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+重复执行驳回和上传磅单操作
+ #重复执行上传磅单、运营驳回操作
+ FOR ${items} IN RANGE 5
+ Run Keyword get_operation_list
+ Run Keyword get_order-receipt-audit-details
+ Run Keyword If '${audit_status}'=='0' Run Keyword 运营审核驳回
+ sleep 1
+ Run Keyword 获取送货单详情
+ Run Keyword If '${status}'=='51' 上传送货单
+ Run Keyword audit_weightnote
+ Run Keyword 获取上传送货单后的订单详情
+ Run Keyword 台账查询
+ END
+
+get_operation_list3
+ #获取运营审核列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0&orderItemId=&orderId=${orderId}
+ ${audit_status} Get From Dictionary ${reps.json()["data"]["records"][0]} status
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId
+ Set Global Variable ${audit_status}
+ Set Global Variable ${auditRequestId}
+
+get_order-receipt-audit-details3
+ #查看运营审核详情
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ log ${reps.json()}
+ ${auditRequestItemId} Get From Dictionary ${reps.json()["data"]["items"][0]} auditRequestItemId #审核项id
+ ${categoryName} Get From Dictionary ${reps.json()["data"]["items"][0]} categoryName #纸品品类名称
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]} paperCategoryId #纸厂品类id
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} netWeight #净重
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #计划回款日期
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]["items"][0]} plateNumber #车牌号
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${paperMillPayAt} Set Variable If '${paperMillPayAt}'=='无账期' null ${paperMillPayAt} #纸厂账期
+ ${settleWeight} Set Variable If '${settleWeight}'=='None' 0 ${settleWeight} #结算重量
+ Set Global Variable ${auditRequestItemId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${datatime}
+
+order-receipt-audit-details3
+ #b保存磅单信息
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ \ \ \ "auditRequestItemId":"${auditRequestItemId}", \ \ \ \ "categoryName":"${categoryName}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "paperMillPayAt":"${paperMillPayAt}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "settlementDate":"${datatime}", \ \ \ \ "weighingDate":"${datatime}", \ \ \ \ "settleWeight":"${settleWeight}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "fundSourceId":"${id}", \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "publicSubsidies":"${publicSubsidies}", \ \ \ \ "publicSubsidiesIncludeTax":0, \ \ \ \ "settleUnitPrice":"${settleUtiPrice}", \ \ \ \ "fundSourceName":"${name}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/edit/order-receipt-audit-details ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+operation_audit
+ #运营审核确认通过
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ "auditRequestId":"${auditRequestId}", \ \ \ \ "isPass":1, \ \ \ \ "remark":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/operation/audit ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ sleep 1
diff --git a/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/__init__.robot b/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/__init__.robot
new file mode 100644
index 0000000..e69de29
diff --git a/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/台账查询.txt b/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/台账查询.txt
new file mode 100644
index 0000000..96eca67
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/台账查询.txt
@@ -0,0 +1,21 @@
+*** Settings ***
+Library Collections
+Library RequestsLibrary
+
+*** Variables ***
+${URL} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+台账查询
+ #获取台账列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/parameter/get/parameter params=pageNum=1&pageSize=10&withdrawState=&state=&orderItemId=${orderItemId}
+ ${台账列表数据} Get From List ${reps.json()["data"]["records"]} 0 #获取台账列表数据
+ #Set Global Variable ${台账列表数据}
+ Should Be Equal As Numbers ${netWeight} ${reps.json()["data"]["records"][0]["netWeight"]}
+ Should Be Equal As Numbers ${unitSurcharge} ${reps.json()["data"]["records"][0]["unitSurcharge"]}
+ #Should Be Equal As Numbers ${settleWeight} ${reps.json()["data"]["records"][0]["settleWeight"]}
+ #Should Be Equal As Numbers ${settleUnitPrice} ${reps.json()["data"]["records"][0]["settleUtiPrice"]}
+ #Should Be Equal As Numbers ${receivableAdjustMoney} ${reps.json()["data"]["records"][0]["receivableAdjustMoney"]}
+ #Should Be Equal As Numbers ${adjustMoney} ${reps.json()["data"]["records"][0]["adjustMoney"]}
diff --git a/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/提交磅单.txt b/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/提交磅单.txt
new file mode 100644
index 0000000..6545de7
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/提交磅单.txt
@@ -0,0 +1,172 @@
+*** Settings ***
+Library RequestsLibrary
+Library DateTime
+Library Collections
+
+*** Variables ***
+${URL} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+获取磅单详情
+ #查看订单列表详情
+ Create Session ZTBT ${URL} ${header}
+ #${data} Set Variable orderId=${orderId} orderItemId=${orderItemId}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #当前订单下单时的合同id
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} unitSurcharge #代卖费
+ ${proxySellerSettleType} Get From Dictionary ${reps.json()["data"]} proxySellerSettleType #代卖费结算方式
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]} paperCategoryId #纸厂品类ID
+ ${unitPrice} Get From Dictionary ${reps.json()["data"]} paperCategoryPrice #品类单价
+ ${publicSubsidies} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} publicSubsidies #公开补贴
+ ${millSupplierId} Get From Dictionary ${reps.json()["data"]} millSupplierId #纸厂供应商ID
+ ${paperMillSupplierName} Get From Dictionary ${reps.json()["data"]} paperMillSupplierName #纸厂供应商名称
+ ${publicSubsidies} Set Variable If '${publicSubsidies}'=='${null}' 0 ${publicSubsidies}
+ #${settleUtiPrice} Evaluate ${unitPrice}+${publicSubsidies} #结算单价
+ ${unitSurcharge} Set Variable If '${unitSurcharge}'=='${None}' 0 ${unitSurcharge}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ ${磅单id} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} id #获取磅单id
+ ${status} Get From Dictionary ${reps.json()["data"]} status
+ ${receivableAdjustMoney} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} receivableAdjustMoney #获取应收调节费
+ ${adjustMoney} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} adjustMoney #获取调节费
+ ${receivableAdjustMoney} Set Variable If '${receivableAdjustMoney}'=='${None}' 0 ${receivableAdjustMoney}
+ ${adjustMoney} Set Variable If '${adjustMoney}'=='${None}' 0 ${adjustMoney}
+ ${settleUtiPrice} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} settleUtiPrice #获取结算单价
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} netWeight #获取净重
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} settleWeight #获取结算重量
+ ${netWeight1} Evaluate ${netWeight}+30
+ FOR ${净重index} IN RANGE ${netWeight} 30
+ Exit For Loop If '${净重index}'=='${netWeight1}'
+ END
+ ${settleWeight1} Evaluate ${settleWeight}+30
+ FOR ${结算重量index} IN RANGE ${settleWeight} 30
+ Exit For Loop If '${结算重量index}'=='${settleWeight1}'
+ END
+ ${unitSurcharge1} Evaluate ${unitSurcharge}+0.001
+ FOR ${代卖费index} IN RANGE ${unitSurcharge} 100
+ Exit For Loop If '${代卖费index}'=='${unitSurcharge1}'
+ END
+ ${settleUtiPrice1} Evaluate ${settleUtiPrice}+0.1
+ FOR ${结算单价index} IN RANGE ${settleUtiPrice} 100
+ Exit For Loop If '${结算单价index}'=='${settleUtiPrice1}'
+ END
+ ${receivableAdjustMoney1} Evaluate ${receivableAdjustMoney}+10
+ FOR ${应收调节费index} IN RANGE ${receivableAdjustMoney} 500
+ Exit For Loop If '${应收调节费index}'=='${receivableAdjustMoney1}'
+ END
+ ${adjustMoney1} Evaluate ${adjustMoney}+10
+ FOR ${应收调节费index} IN RANGE ${adjustMoney} 500
+ Exit For Loop If '${应收调节费index}'=='${adjustMoney1}'
+ END
+ Set Global Variable ${contractId}
+ Set Global Variable ${unitSurcharge}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${settleUtiPrice1}
+ Set Global Variable ${unitPrice}
+ Set Global Variable ${publicSubsidies}
+ Set Global Variable ${millSupplierId}
+ Set Global Variable ${paperMillSupplierName}
+ Set Global Variable ${proxySellerSettleType}
+ Set Global Variable ${contractId}
+ Set Global Variable ${netWeight1}
+ Set Global Variable ${settleWeight1}
+ Set Global Variable ${磅单id}
+ Set Global Variable ${status}
+ Set Global Variable ${unitSurcharge1}
+ Set Global Variable ${adjustMoney1}
+ Set Global Variable ${receivableAdjustMoney1}
+
+weightnote
+ #驳回后重新提交磅单
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "deductedPoint":0, \ \ \ \ "imageUrl":[ \ \ \ \ \ \ \ \ "${pictures}" \ \ \ \ ], \ \ \ \ "orderItemId":"${orderItemId}", \ \ \ \ "unitPrice":"${unitPrice}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "millSupplierId":"${supplier_id}", \ \ \ \ "millSupplierName":"${millSupplierName}", \ \ \ \ "settleUtiPriceIncludeTax":2.04012, \ \ \ \ "settleUtiPriceIncludeTaxType":1, \ \ \ \ "receivableAdjustMoney":"${receivableAdjustMoney1}", \ \ \ \ "refundSubsidy":0.002, \ \ \ \ "adjustMoney":"${adjustMoney1}", \ \ \ \ "collectionCharges":"${proxyPaySurcharge}", \ \ \ \ "advanceFund":"${advanceFund}", \ \ \ \ "contractId":"${contractId}", \ \ \ \ "warehouseName":"${所属仓库}", \ \ \ \ "weightDay":"${datatime}", \ \ \ \ "settleDay":"${datatime}", \ \ \ \ "transactionMainEnterpriseId":"${交易主体id}", \ \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "proxySellerSettleType":"${proxySellerSettleType}", \ \ \ \ "receivableSettlementRules":"${receivableSettlementRules}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "deductionNotes":"${datatime}", \ \ \ \ "plateNumber":"${carList}", \ \ \ \ "settlePriceIncludeTaxSettleRules":"${settlePriceIncludeTaxSettleRules}", \ \ \ \ "settleUtiPrice":"${settleUtiPrice1}", \ \ \ \ "netWeight":"${netWeight1}", \ \ \ \ "activitySettleType":null, \ \ \ \ "unitSurcharge":"${unitSurcharge1}", \ \ \ \ "deliveryImageUrls":[ \ \ \ \ \ ], \ \ \ \ "publicSubsidies":0, \ \ \ \ "isSubsidyAndDeductIncludeTax":0, \ \ \ \ "orderId":"${orderId}", \ \ \ \ "settleWeight":"${settleWeight1}", \ \ \ \ "deductedWeight":2, \ \ \ \ "orderType":"${orderType}", \ \ \ \ "otherAmountList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"freightSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"contrabandPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"nonStandardPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ } \ \ \ \ ], \ \ \ \ "id":"${磅单id}" \ \ \ \ }
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/proxy-sell/update/weightnote ${data.encode('utf-8')}
+ log ${reps.json()["data"]}
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]} weightNoteId
+ Set Global Variable ${weightNoteId}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+获取上传磅单后的订单详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ ${settleUnitPrice} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} settleUtiPrice #获取结算单价
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} unitSurcharge #获取代卖费
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} netWeight #获取净重
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} settleWeight #获取结算重量
+ ${receivableAdjustMoney} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} receivableAdjustMoney #获取应收调节费
+ ${adjustMoney} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} adjustMoney #获取调节费
+ Set Global Variable ${settleUnitPrice}
+ Set Global Variable ${unitSurcharge}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${receivableAdjustMoney}
+ Set Global Variable ${adjustMoney}
+
+获取送货单详情
+ #获取订单详情信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId} &orderItemId=${orderItemId}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ ${paperMillId} Get From Dictionary ${reps.json()["data"]} paperMillId #纸厂id
+ ${paperCategoryPrice} Get From Dictionary ${reps.json()["data"]} paperCategoryPrice #品类价格
+ ${publicSubsidies} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} publicSubsidies #公开补贴
+ ${activitySettleType} Get From Dictionary ${reps.json()["data"]} activitySettleType #活动订单结算方式
+ ${proxySellerSettleType} Get From Dictionary ${reps.json()["data"]} proxySellerSettleType #代卖费结算方式
+ ${交易主体id} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseId #交易主体id
+ ${交易主体name} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseName #交易主体name
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]} unitSurcharge #代卖费单价
+ ${publicSubsidies} Set Variable If '${publicSubsidies}'=='${null}' 0 ${publicSubsidies}
+ ${settleUtiPrice}= Evaluate ${unitPrice}+${publicSubsidies} #结算单价
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ ${磅单id} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} id #获取磅单id
+ ${status} Get From Dictionary ${reps.json()["data"]} status
+ ${unitSurcharge3} Evaluate ${unitSurcharge}+0.001
+ FOR ${代卖费index} IN RANGE ${unitSurcharge} 100
+ Exit For Loop If '${代卖费index}'=='${unitSurcharge3}'
+ END
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} netWeight #获取净重
+ ${netWeight3} Evaluate ${netWeight}+300
+ FOR ${净重index} IN RANGE ${netWeight} 30
+ Exit For Loop If '${净重index}'=='${netWeight3}'
+ END
+ Set Global Variable ${contractId}
+ Set Global Variable ${paperMillId}
+ Set Global Variable ${paperCategoryPrice}
+ Set Global Variable ${publicSubsidies}
+ Set Global Variable ${activitySettleType}
+ Set Global Variable ${proxySellerSettleType}
+ Set Global Variable ${settleUtiPrice}
+ Set Global Variable ${交易主体id}
+ Set Global Variable ${交易主体name}
+ Set Global Variable ${unitSurcharge3}
+ Set Global Variable ${netWeight3}
+ Set Global Variable ${磅单id}
+ Set Global Variable ${status}
+
+上传送货单
+ #上传送货单
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "settleUtiPrice":"${settleUtiPrice}", \ \ \ \ "publicSubsidies":0, \ \ \ \ "netWeight":"${netWeight3}", \ \ \ \ "settleWeight":null, \ \ \ \ "unitSurcharge":${unitSurcharge3}, \ \ \ \ "transactionMainEnterpriseId":"${交易主体id}", \ \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "activitySettleType":"${activitySettleType}", \ \ \ \ "proxySellerSettleType":"${proxySellerSettleType}", \ \ \ \ "remark":null, \ \ \ \ "imageUrl":[ \ \ \ \ \ \ \ \ "${pictures}" \ \ \ \ ], \ \ \ \ "orderItemId":"${orderItemId}", \ \ \ \ "orderId":"${orderId}", \ \ \ \ "settleDay":"${datatime}", \ \ \ \ "settlePrice":0, \ \ \ \ "contractId":"${contractId}", \ \ \ \ "millSupplierId":"${supplier_id}", \ \ \ \ "millSupplierName":"${millSupplierName}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "orderType":"${orderType}", \ \ \ \ "weightDay":"${datatime}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "warehouseName":"${所属仓库}", \ \ \ \ "deductionNotes":"${datatime}", \ \ \ \ "receivableSettlementRules":"${receivableSettlementRules}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "otherAmountList":[ \ \ \ \ \ ], \ \ \ \ "unitPrice":"${paperCategoryPrice}", \ \ \ \ "id":"${磅单id}" \ \ \ \ \ }
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/proxy-sell/update/weightnote ${data.encode('utf-8')}
+ log ${reps.json()}
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]} weightNoteId #磅单编号
+ Set Global Variable ${weightNoteId}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ Set Global Variable ${datatime}
+
+获取上传送货单后的订单详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} netWeight #获取净重
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} unitSurcharge #获取代卖费
+ Set Global Variable ${netWeight}
+ Set Global Variable ${unitSurcharge}
+
+audit_weightnote
+ Create Session ZTBT ${URL} ${header}
+ ${repsonse} Post On Session ZTBT recycle-service/admin/customer-service/audit/weightnote/${weightNoteId}
+ log ${repsonse.json()}
diff --git a/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/运营审核驳回.txt b/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/运营审核驳回.txt
new file mode 100644
index 0000000..2098597
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/2.1-Consignment management/运营审核驳回.txt
@@ -0,0 +1,61 @@
+*** Settings ***
+Library RequestsLibrary
+Library DateTime
+Library Collections
+
+*** Variables ***
+${URL} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+get_operation_list
+ #获取运营审核列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0&orderItemId=&orderId=${orderId}
+ ${audit_status} Get From Dictionary ${reps.json()["data"]["records"][0]} status
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId
+ Set Global Variable ${audit_status}
+ Set Global Variable ${auditRequestId}
+
+get_order-receipt-audit-details
+ #查看运营审核详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ log ${reps.json()}
+ ${auditRequestItemId} Get From Dictionary ${reps.json()["data"]["items"][0]} auditRequestItemId #审核项id
+ ${categoryName} Get From Dictionary ${reps.json()["data"]["items"][0]} categoryName #纸品品类名称
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]} paperCategoryId #纸厂品类id
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} netWeight #净重
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #计划回款日期
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]["items"][0]} plateNumber #车牌号
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${settleWeight} Set Variable If '${settleWeight}'=='None' 0 ${settleWeight}
+ ${surcharge1} Evaluate ${unitSurcharge}*${netWeight}
+ ${surcharge2} Evaluate ${unitSurcharge}*${settleWeight}
+ ${surcharge} Set Variable If '${proxySellerSettleType}'=='0' ${surcharge1} ${surcharge2} #代卖费总额
+ ${paperMillPayAt} Set Variable If '${paperMillPayAt}'=='无账期' null ${paperMillPayAt} #纸厂账期
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]} auditRequestId
+ Set Global Variable ${auditRequestItemId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${surcharge}
+ Set Global Variable ${auditRequestId}
+
+保存磅单信息
+ #b保存磅单信息
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d #获取当前时间
+ ${data} Set Variable { \ \ \ \ "auditRequestItemId":"${auditRequestItemId}", \ \ \ \ "categoryName":"${categoryName}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "paperMillPayAt":"${paperMillPayAt}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "settlementDate":"${datatime}", \ \ \ \ "weighingDate":"${datatime}", \ \ \ \ "settleWeight":"${settleWeight}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "fundSourceId":"${id}", \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "publicSubsidies":"${publicSubsidies}", \ \ \ \ "publicSubsidiesIncludeTax":0, \ \ \ \ "settleUnitPrice":"${settleUtiPrice}", \ \ \ \ "fundSourceName":"${name}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/edit/order-receipt-audit-details ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+运营审核驳回
+ #运营审核驳回
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "auditRequestId":"${auditRequestId}", \ \ \ \ "isPass":2, \ \ \ \ "remark":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/operation/audit ${data.encode('utf-8')}
diff --git a/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/4-Financial_audit.robot b/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/4-Financial_audit.robot
new file mode 100644
index 0000000..ee4cd03
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/4-Financial_audit.robot
@@ -0,0 +1,41 @@
+*** Settings ***
+Documentation 代卖应付
+Library RequestsLibrary
+Library Collections
+Resource 财务审核驳回.txt
+Resource 运营审核通过.txt
+Resource 台账查询.txt
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${url} http://api-ops-psc-test.qniao.cn
+${URL1} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_list
+ #获取财务审核列表
+ Create Session ZTBT ${url} ${header}
+ ${reps} Get On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/get/list params=pageNum=1&pageSize=10&status=&orderId=&orderItemId=${orderItemId}
+ ${auditedTime} Get From Dictionary ${reps.json()["data"]["records"][0]} auditedTime #财务第一次确认结算时间
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ #Set Global Variable ${auditedTime}
+
+get_order-log-detail
+ #财务审核驳回操作记录
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/order-log-detail params=orderId=${orderId}&weightNoteId=${weightNoteId}&operationStatus=3
+
+paper-mill-order-receipt-proof-request_audit
+ #财务审核确认通过
+ Create Session ZTBT ${url} ${header}
+ ${data} Set Variable {"auditRequestId":"${auditRequestId}","adminId":null,"isPass":1,"remark":"${datatime}" }
+ ${reps} Post On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/audit ${data.encode('utf-8')}
+ log ${reps.json()}
+ sleep 1
+
+paper-mill-order-receipt-proof-request_settle
+ #确认结算
+ Create Session ZTBT ${url} ${header}
+ ${data} Set Variable { \ \ \ \ "id":"${auditRequestId}", \ \ \ \ "adminId":null }
+ ${reps} Post On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/settle ${data.encode('utf-8')}
+ sleep 1
diff --git a/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/5-Sales_receivables.robot b/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/5-Sales_receivables.robot
new file mode 100644
index 0000000..0f75fdf
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/5-Sales_receivables.robot
@@ -0,0 +1,36 @@
+*** Settings ***
+Documentation 代卖应收
+Library RequestsLibrary
+Library Collections
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_paper-payment-order-list
+ #通过订单编号获取代卖应收列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-payment-order-list params=pageNum=1&pageSize=10&orderId=${orderId}
+ ${paymentOrderId} Get From Dictionary ${reps.json()["data"]["records"][0]} id #回款单号
+ log ${reps.json()}
+ Set Global Variable ${paymentOrderId}
+
+get_order-receipt-audit-details
+ #代卖应收详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ ${receivablePriceIncludeTax} Get From Dictionary ${reps.json()["data"]["items"][0]} receivablePriceIncludeTax
+ #${receivablePrice} Get From Dictionary ${reps.json()["data"]["items"][0]} receivablePrice #获取应收金额
+ ${noReceivablePrice} Get From Dictionary ${reps.json()["data"]["items"][0]} noReceivablePrice #获取未收金额
+ #Set Global Variable ${receivablePrice}
+ Set Global Variable ${receivablePriceIncludeTax}
+ Set Global Variable ${noReceivablePrice}
+
+update_payment-order-status
+ #确认回款操作
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ \ \ \ "paymentOrderId":"${paymentOrderId}", \ \ \ \ "receivablePrice":"${receivablePriceIncludeTax}", \ \ \ \ "paidPrice":"${receivablePriceIncludeTax}", \ \ \ \ "noReceiveblePrice":"${noReceivablePrice}", \ \ \ \ "bankFlowNo":null, \ \ \ \ "paymentAdjustmentFee":null, \ \ \ \ "returnPayDate":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/update/payment-order-status ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ sleep 5
diff --git a/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/台账查询.txt b/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/台账查询.txt
new file mode 100644
index 0000000..64abf98
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/台账查询.txt
@@ -0,0 +1,20 @@
+*** Settings ***
+Library Collections
+Library RequestsLibrary
+
+*** Variables ***
+${URL1} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+台账查询
+ #获取台账列表
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/parameter/get/parameter params=pageNum=1&pageSize=10&withdrawState=&state=&orderItemId=${orderItemId}
+ ${台账列表数据} Get From List ${reps.json()["data"]["records"]} 0 #获取台账列表数据
+ #Set Global Variable ${台账列表数据}
+ #${receivableAdjustMoney1} Get From Dictionary ${reps.json()["data"]["records"][0]} receivableAdjustMoney #获取应收调节费
+ #${receivableAdjustMoney1} Set Variable If '${receivableAdjustMoney}'=='None' Should Not Be Equal As Numbers ${receivableAdjustMoney} ${receivableAdjustMoney1}
+ #Should Be Equal As Numbers ${receivableAdjustMoney} ${reps.json()["data"]["records"][0]["receivableAdjustMoney"]} #对比应收调节费
+ Should Be Equal As Numbers ${noReceivablePrice} ${reps.json()["data"]["records"][0]["noReceivablePrice"]} #对比未收款金额
+ Should Be Equal As Strings ${paperMillPayAt} ${reps.json()["data"]["records"][0]["paperMillPayAt"]} #对比预计回款日期
diff --git a/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/财务审核驳回.txt b/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/财务审核驳回.txt
new file mode 100644
index 0000000..d9f1ba8
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/财务审核驳回.txt
@@ -0,0 +1,30 @@
+*** Settings ***
+Library Collections
+Library DateTime
+Library RequestsLibrary
+
+*** Variables ***
+${URL1} http://api-ops-ztb-test.qniao.cn
+${url} http://api-ops-psc-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+获取财务审核列表
+ #获取财务审核列表
+ Create Session ZTBT ${url} ${header}
+ ${reps} Get On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/get/list params=pageNum=1&pageSize=10&status=&orderId=&orderItemId=${orderItemId}
+ #${auditedTime} Get From Dictionary ${reps.json()["data"]["records"][0]} auditedTime #财务第一次确认结算时间
+ ${staus} Get From Dictionary ${reps.json()["data"]["records"][0]} status #获取审核状态
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ #Set Global Variable ${auditedTime}
+ Set Global Variable ${staus}
+ Set Global Variable ${auditRequestId}
+
+财务驳回
+ #财务审核驳回
+ Create Session ZTBT ${url} ${header}
+ ${data} Set Variable {"auditRequestId":"${auditRequestId}","adminId":null,"isPass":2,"remark":"${datatime}" }
+ ${reps} Post On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/audit ${data.encode('utf-8')}
+ log ${reps.json()}
+ sleep 1
diff --git a/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/运营审核通过.txt b/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/运营审核通过.txt
new file mode 100644
index 0000000..74be8e4
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/3-Withdrawal_application/运营审核通过.txt
@@ -0,0 +1,72 @@
+*** Settings ***
+Library RequestsLibrary
+Library DateTime
+Library Collections
+
+*** Variables ***
+${URL1} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+get_operation_list
+ #获取运营审核列表
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0&orderItemId=&orderId=${orderId}
+ ${audit_status} Get From Dictionary ${reps.json()["data"]["records"][0]} status
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId
+ Set Global Variable ${audit_status}
+ Set Global Variable ${auditRequestId}
+
+get_order-receipt-audit-details
+ #查看运营审核详情
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ log ${reps.json()}
+ ${auditRequestItemId} Get From Dictionary ${reps.json()["data"]["items"][0]} auditRequestItemId #审核项id
+ ${categoryName} Get From Dictionary ${reps.json()["data"]["items"][0]} categoryName #纸品品类名称
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]["items"][0]} paperCategoryId #纸厂品类id
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} netWeight #净重
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #计划回款日期
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]["items"][0]} plateNumber #车牌号
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${settleWeight} Set Variable If '${settleWeight}'=='None' 0 ${settleWeight}
+ ${surcharge1} Evaluate ${unitSurcharge}*${netWeight}
+ ${surcharge2} Evaluate ${unitSurcharge}*${settleWeight}
+ ${surcharge} Set Variable If '${proxySellerSettleType}'=='0' ${surcharge1} ${surcharge2} #代卖费总额
+ ${paperMillPayAt} Set Variable If '${paperMillPayAt}'=='无账期' null ${paperMillPayAt} #纸厂账期
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]} auditRequestId
+ Set Global Variable ${auditRequestItemId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${surcharge}
+ Set Global Variable ${auditRequestId}
+
+order-receipt-audit-details
+ #b保存磅单信息
+ Create Session ZTBT ${URL1} ${header}
+ ${data} Set Variable { \ \ \ \ "auditRequestItemId":"${auditRequestItemId}", \ \ \ \ "categoryName":"${categoryName}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "paperMillPayAt":"${paperMillPayAt}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "settlementDate":"${datatime}", \ \ \ \ "weighingDate":"${datatime}", \ \ \ \ "settleWeight":"${settleWeight}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "fundSourceId":"${id}", \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "publicSubsidies":"${publicSubsidies}", \ \ \ \ "publicSubsidiesIncludeTax":0, \ \ \ \ "settleUnitPrice":"${settleUtiPrice}", \ \ \ \ "fundSourceName":"${name}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/edit/order-receipt-audit-details ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+运营审核通过
+ #运营审核通过
+ Create Session ZTBT ${URL1} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "auditRequestId":"${auditRequestId}", \ \ \ \ "isPass":1, \ \ \ \ "remark":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/operation/audit ${data.encode('utf-8')}
+
+运营审核后详情
+ #查看运营审核详情
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ ${noReceivablePrice} Get From Dictionary ${reps.json()["data"]["items"][0]} noReceivablePrice #获取未收款金额
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #获取计划回款日期
+ ${receivableAdjustMoney} Get From Dictionary ${reps.json()["data"]["items"][0]} receivableAdjustMoney #获取应收调节费
+ #${noReceivablePrice} Evaluate ${noReceivablePrice}+1
+ Set Global Variable ${noReceivablePrice}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${receivableAdjustMoney}
diff --git a/002-Activeorder/2-Background_system(Test)/4-Consignment_management/2.3-ActiveUpload-weightnote.robot b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/2.3-ActiveUpload-weightnote.robot
new file mode 100644
index 0000000..147307f
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/2.3-ActiveUpload-weightnote.robot
@@ -0,0 +1,207 @@
+*** Settings ***
+Library requests
+Library Collections
+Library RequestsLibrary
+Library DateTime
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_proxy-order-item-list
+ #查找预约的订单项列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order-item-list params=pageNum=1&pageSize=10&orderType=2&status=51&weightNoteType=2&orderItemId=${orderItemId}
+ log ${reps.json()}
+ ${orderItemId} Get From Dictionary ${reps.json()["data"]["records"][0]} orderItemId #订单项编号
+ Set Global Variable ${orderItemId}
+ Should Be Equal As Strings ${reps.json()["data"]["records"][0]["orderId"]} ${orderId}
+
+get_proxy-order-details
+ #查看订单详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #当前订单下单时的合同id
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]} unitSurcharge #代卖费
+ ${proxySellerSettleType} Get From Dictionary ${reps.json()["data"]} proxySellerSettleType #代卖费结算方式
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]} paperCategoryId #纸厂品类ID
+ ${unitPrice} Get From Dictionary ${reps.json()["data"]} paperCategoryPrice #品类单价
+ ${publicSubsidies} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} publicSubsidies #公开补贴
+ ${millSupplierId} Get From Dictionary ${reps.json()["data"]} millSupplierId #纸厂供应商ID
+ ${paperMillSupplierName} Get From Dictionary ${reps.json()["data"]} paperMillSupplierName #纸厂供应商名称
+ ${surcharge} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} surcharge #代卖费总额
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ ${paymentType} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} paymentType #支付类型
+ ${activityNoteStatus} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} activityNoteStatus #活动状态
+ ${交易主体id} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseId #交易主体id
+ ${交易主体name} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseName #交易主体name
+ ${publicSubsidies} Set Variable If '${publicSubsidies}'=='${null}' 0 ${publicSubsidies}
+ ${settleUtiPrice}= Evaluate ${unitPrice}+${publicSubsidies} #结算单价
+ log ${contractId}
+ Set Global Variable ${contractId}
+ Set Global Variable ${unitSurcharge}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${settleUtiPrice}
+ Set Global Variable ${unitPrice}
+ Set Global Variable ${publicSubsidies}
+ Set Global Variable ${millSupplierId}
+ Set Global Variable ${paperMillSupplierName}
+ Set Global Variable ${proxySellerSettleType}
+ Set Global Variable ${contractId}
+ Set Global Variable ${surcharge}
+ Set Global Variable ${paymentType}
+ Set Global Variable ${activityNoteStatus}
+ Set Global Variable ${交易主体name}
+ Set Global Variable ${交易主体id}
+
+get_delivery-info
+ #获取订单名片信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/proxy-sell/get/proxy-order/delivery-info/${orderItemId}
+ log ${reps.json()}
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]} plateNumber #车牌号
+ ${settleUtiPrice} Get From Dictionary ${reps.json()["data"]} settleUtiPrice #结算单价
+ ${settleUtiPriceIncludeTaxType} Get From Dictionary ${reps.json()["data"]} settleUtiPriceIncludeTaxType #含税补贴价类型
+ ${netWeight} Get From Dictionary ${reps.json()["data"]} netWeight #净重
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleUtiPrice}
+ Set Global Variable ${settleUtiPriceIncludeTaxType}
+ Set Global Variable ${netWeight}
+
+get-contract-list
+ #获取订单纸厂的所有合同信息
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT /recycle-service/admin/contract/get/selectable-contract-list params=orderItemId=${orderItemId}
+ log ${reps.json()}
+
+get_weightnote
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/proxy-sell/get/weightnote/${weightnoteId}
+ log ${reps.json()}
+
+get_paperMill-supplier
+ #获取纸厂供应商
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/paper-mill-merchant/${paperMillId} params=paperMillId=${paperMillId}
+ log ${reps.json()}
+
+get-Warehouse
+ #获取所属仓库
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/transaction-main-enterprise/get/warehouse-name
+ ${仓库} Get From Dictionary ${reps.json()} data
+ #随机获取仓库
+ ${所属仓库} Evaluate random.choice(${仓库}) random
+ log to console \nvalue:${所属仓库}
+ Set Global Variable ${所属仓库}
+
+get-Source of funds
+ #获取资金来源
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/fund-source/get/list
+ log ${reps.json()}
+ ${data} Get From Dictionary ${reps.json()} data
+ FOR ${item} IN @{data}
+ log ${item}
+ ${isDefault} Get From Dictionary ${item} isDefault #获取启用状态
+ ${name} Get From Dictionary ${item} name #获取name
+ ${id} Get From Dictionary ${item} id #获取id
+ Exit For Loop If '${isDefault}'=='1'
+ END
+ Set Global Variable ${name}
+ Set Global Variable ${id}
+
+get_paper-mill-category
+ #获取当前纸厂的所有纸品品类
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/paperMill/get/paper-mill-category/${paperMillId} params=id=${paperMillId}
+ log ${reps.json()}
+
+get_contract_by_id
+ #获取下单时绑定的合同
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/contract/get/detail-by-id params=id=${contractId}
+ log ${reps.json()}
+ #获取垫资费、企业ID、应收金额结算规则、含税结算单价结算规则
+ ${advanceFund} Get From Dictionary ${reps.json()["data"]} advanceFund #垫资费
+ ${buyerEnterpriseId} Get From Dictionary ${reps.json()["data"]} buyerEnterpriseId #企业id
+ ${settleRules} Get From Dictionary ${reps.json()["data"]} settleRules #应收金额结算规则
+ ${settlePriceIncludeTaxSettleRules} Get From Dictionary ${reps.json()["data"]} settlePriceIncludeTaxSettleRules #含税结算单价结算规则
+ ${taxRefundRate} Get From Dictionary ${reps.json()["data"]} taxRefundRate #税点
+ ${proxyPaySurcharge} Get From Dictionary ${reps.json()["data"]} proxyPaySurcharge #代收费
+ ${hasInvoice} Get From Dictionary ${reps.json()["data"]} hasInvoice #是否开票
+ ${accountPeriodType} Get From Dictionary ${reps.json()["data"]} accountPeriodType #账期类型
+ ${isSubsidyAndDeductIncludeTax} Get From Dictionary ${reps.json()["data"]} isSubsidyAndDeductIncludeTax #纸厂补贴是否含税
+ ${receivableSettlementRules} Get From Dictionary ${reps.json()["data"]} settleRules #应收金额结算规则
+ ${settlePriceIncludeTaxSettleRules} Get From Dictionary ${reps.json()["data"]} settlePriceIncludeTaxSettleRules #含税结算单价结算规则
+ ${advanceFund} Set Variable If '${advanceFund}'=='${None}' 0 ${advanceFund}
+ ${proxyPaySurcharge} Set Variable If '${proxyPaySurcharge}'=='${None}' 0 ${proxyPaySurcharge}
+ Set Global Variable ${advanceFund}
+ Set Global Variable ${buyerEnterpriseId}
+ Set Global Variable ${taxRefundRate}
+ Set Global Variable ${proxyPaySurcharge}
+ Set Global Variable ${hasInvoice}
+ Set Global Variable ${accountPeriodType}
+ Set Global Variable ${settleRules}
+ Set Global Variable ${settlePriceIncludeTaxSettleRules}
+ Set Global Variable ${isSubsidyAndDeductIncludeTax}
+ Set Global Variable ${receivableSettlementRules}
+ Set Global Variable ${settlePriceIncludeTaxSettleRules}
+
+get-category price
+ #获取下单品类,上传磅单时的价格
+ Create Session ZTBT ${URL} ${header}
+ ${dataTime} Get Current Date result_format=%Y-%m-%d
+ ${reps} Get On Session ZTBT recycle-service/admin/proxy-sell/get-category-price-by-date params=orderItemId=${orderItemId}&weightDay=${dataTime}
+ log ${reps.json()}
+ ${price} Get From Dictionary ${reps.json()["data"][0]} price #下单品类价格
+ ${publicSubsidies} Get From Dictionary ${reps.json()["data"][0]} publicSubsidies #下单品类公开补贴
+ Set Global Variable ${price}
+ Set Global Variable ${publicSubsidies}
+ Set Global Variable ${dataTime}
+
+Upload_pictures
+ #上传图片
+ #${dict} Create Dictionary Content-Type=image/jpeg filename=20210803.jpg
+ #Create Session ZTBT ${URL} ${dict}
+ ${filepath} Evaluate open('E:/lyl/图片/21042217001449712.png','rb')
+ ${image} Evaluate open('E:/lyl/图片/21042217001449712.png','rb')
+ ${file} Create Dictionary filepath=${filepath} image=${image}
+ Create Session ZTBT ${URL}
+ log ${file}
+ ${result} Post On Session ZTBT recycle-user-center/upload/image files=${file}
+ ${pictures} Get From Dictionary ${result.json()} data
+ log ${result.content}
+ Set Global Variable ${pictures}
+
+get_repeat_proxy-order
+ #获取重复订单信息
+ Create Session ZTBT ${URL} ${header}
+ #${datatime}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/repeat/proxy-order params=orderItemId=${orderItemId}&plateNumber=${carList}&settleWeight=13550&weighingDate=${datatime}&orderType=${orderType}
+ log ${reps.json()}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+weightnote
+ #提交磅单
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "id":"${weightNoteId}", \ \ \ \ "orderId":"${orderId}", \ \ \ \ "orderItemId":"${orderItemId}", \ \ \ \ "type":null, \ \ \ \ "weightDay":"${datatime}", \ \ \ \ "settleDay":"${datatime}", \ \ \ \ "settleUtiPrice":"${settleUtiPrice}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "settleWeight":16200, \ \ \ \ "deductedPoint":7.5, \ \ \ \ "unitSurcharge":"${unitSurcharge}", \ \ \ \ "surcharge":"${surcharge}", \ \ \ \ "adjustMoney":"20", \ \ \ \ "remark":"${datatime}", \ \ \ \ "imageUrls":null, \ \ \ \ "transactionMainEnterpriseid":"${交易主体id}", \ \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "warehouseName":"${所属仓库}", \ \ \ \ "settlePrice":22585.5, \ \ \ \ "activitySettleType":"${activitySettleType}", \ \ \ \ "proxySellerSettleType":"${proxySellerSettleType}", \ \ \ \ "publicSubsidies":0, \ \ \ \ "unitPrice":"${unitPrice}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "remarkImgs":[ \ \ \ \ \ \ \ \ "${pictures}" \ \ \ \ ], \ \ \ \ "otherAmountList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"freightSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.002, \ \ \ \ \ \ \ \ \ \ \ \ "title":"contrabandPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":2, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":20, \ \ \ \ \ \ \ \ \ \ \ \ "title":"nonStandardPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":2, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":10, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ } \ \ \ \ ], \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "receivableSettlementRules":"${receivableSettlementRules}", \ \ \ \ "refundSubsidy":0.003, \ \ \ \ "receivableAdjustMoney":"20", \ \ \ \ "settleUtiPriceIncludeTax":1.337448648648649, \ \ \ \ "settleUtiPriceIncludeTaxType":"${settleUtiPriceIncludeTaxType}", \ \ \ \ "collectionCharges":"${proxyPaySurcharge}", \ \ \ \ "advanceFund":"${advanceFund}", \ \ \ \ "millSupplierId":"${supplier_id}", \ \ \ \ "millSupplierName":"${millSupplierName}", \ \ \ \ "contractId":"${contractId}", \ \ \ \ "settlePriceIncludeTaxSettleRules":"${settlePriceIncludeTaxSettleRules}", \ \ \ \ "paperCategoryId":"${categoryId}", \ \ \ \ "deductionNotes":"${datatime}", \ \ \ \ "imageUrl":[ \ \ \ \ \ \ \ \ "${pictures}" \ \ \ \ ], \ \ \ \ "deductedWeight":1.5, \ \ \ \ "orderType":"${orderType}" }
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/proxy-sell/update/weightnote ${data.encode('utf-8')}
+ log ${reps.json()["data"]}
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]} weightNoteId
+ Set Global Variable ${weightNoteId}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+audit_weightnote
+ Create Session ZTBT ${URL} ${header}
+ ${repsonse} Post On Session ZTBT recycle-service/admin/customer-service/audit/weightnote/${weightNoteId}
+ log ${repsonse.json()}
+
+get_proxy-order
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ log ${reps.json()}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
diff --git a/002-Activeorder/2-Background_system(Test)/4-Consignment_management/3.3--Operation_audit.robot b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/3.3--Operation_audit.robot
new file mode 100644
index 0000000..7a98145
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/3.3--Operation_audit.robot
@@ -0,0 +1,81 @@
+*** Settings ***
+Library RequestsLibrary
+Library Collections
+Library DateTime
+Resource 更新磅单.txt
+Resource 运营审核驳回.txt
+Resource 台账查询.txt
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_operation_list
+ #获取运营审核列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0
+ log ${reps.json()}
+
+get_paper-mill-order-by-orderItemId
+ #根据订单编号获取运营审核单
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0&orderItemId=${orderItemId}
+ log ${reps.json()}
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId #获取审核id
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]["records"][0]} weightNoteId #获取磅单id
+ Set Global Variable ${auditRequestId}
+ Set Global Variable ${weightNoteId}
+
+get_order-log-detail
+ #获取订单日志
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/order-log-detail params=orderId=${orderId}&weightNoteId=${weightNoteId}
+ log ${reps.json()}
+
+get_order-receipt-audit-details
+ #查看运营审核详情
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ log ${reps.json()}
+ ${auditRequestItemId} Get From Dictionary ${reps.json()["data"]["items"][0]} auditRequestItemId #审核项id
+ ${categoryName} Get From Dictionary ${reps.json()["data"]["items"][0]} categoryName #纸品品类名称
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]} paperCategoryId #纸厂品类id
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} netWeight #净重
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #计划回款日期
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]["items"][0]} plateNumber #车牌号
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${paperMillPayAt} Set Variable If '${paperMillPayAt}'=='无账期' null ${paperMillPayAt} #纸厂账期
+ Set Global Variable ${auditRequestItemId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${datatime}
+ Set Global Variable ${settleWeight}
+
+order-receipt-audit-details
+ #b保存磅单信息
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ \ \ \ "auditRequestItemId":"${auditRequestItemId}", \ \ \ \ "categoryName":"${categoryName}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "paperCategoryId":"${paperCategoryId}", \ \ \ \ "paperMillPayAt":null, \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "receivablePrice":5550, \ \ \ \ "settlementDate":"${datatime}", \ \ \ \ "weighingDate":"${datatime}", \ \ \ \ "settleWeight":"${settleWeight}", \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "fundSourceId":"${id}", \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "publicSubsidies":0, \ \ \ \ "publicSubsidiesIncludeTax":0, \ \ \ \ "settleUnitPrice":"${settleUtiPrice}", \ \ \ \ "settleUnitPriceIncludeTax":1.337449, \ \ \ \ "fundSourceName":"${name}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/edit/order-receipt-audit-details ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+get_order-log-detail2
+ #运营审核驳回操作日志
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/order-log-detail params=orderId=${orderId}&weightNoteId=${weightNoteId} &operationStatus=2
+ log ${reps.json()}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+operation_audit
+ #运营审核确认通过
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ "auditRequestId":"${auditRequestId}", \ \ \ \ "isPass":1, \ \ \ \ "remark":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/operation/audit ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+ sleep 2
diff --git a/002-Activeorder/2-Background_system(Test)/4-Consignment_management/4.3-Financial_audit.robot b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/4.3-Financial_audit.robot
new file mode 100644
index 0000000..8999fe9
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/4.3-Financial_audit.robot
@@ -0,0 +1,36 @@
+*** Settings ***
+Library RequestsLibrary
+Library Collections
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${url} http://api-ops-psc-test.qniao.cn
+${URL1} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_list
+ #获取财务审核列表
+ Create Session ZTBT ${url} ${header}
+ ${reps} Get On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/get/list params=pageNum=1&pageSize=10&status=&orderId=&orderItemId=${orderItemId}
+ log ${reps.json()}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+get_order-log-detail
+ #财务审核驳回操作记录
+ Create Session ZTBT ${URL1} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/order-log-detail params=orderId=${orderId}&weightNoteId=${weightNoteId}&operationStatus=3
+
+paper-mill-order-receipt-proof-request_audit
+ #财务审核确认通过
+ Create Session ZTBT ${url} ${header}
+ ${data} Set Variable {"auditRequestId":"${auditRequestId}","adminId":null,"isPass":1,"remark":"${datatime}" }
+ ${reps} Post On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/audit ${data.encode('utf-8')}
+ log ${reps.json()}
+ sleep 1
+
+paper-mill-order-receipt-proof-request_settle
+ #确认结算
+ Create Session ZTBT ${url} ${header}
+ ${data} Set Variable { \ \ \ \ "id":"${auditRequestId}", \ \ \ \ "adminId":null }
+ ${reps} Post On Session ZTBT payment-settlement-center/admin/paper-mill-order-receipt-proof-request/settle ${data.encode('utf-8')}
+ sleep 2
diff --git a/002-Activeorder/2-Background_system(Test)/4-Consignment_management/5.3-sales_receivable.robot b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/5.3-sales_receivable.robot
new file mode 100644
index 0000000..1061a2f
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/5.3-sales_receivable.robot
@@ -0,0 +1,34 @@
+*** Settings ***
+Documentation 代卖应收
+Library RequestsLibrary
+Library Collections
+
+*** Variables ***
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+${URL} http://api-ops-ztb-test.qniao.cn
+
+*** Test Cases ***
+get_paper-payment-order-list
+ #通过订单编号获取代卖应收列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-payment-order-list params=pageNum=1&pageSize=10&orderId=${orderId}
+ ${paymentOrderId} Get From Dictionary ${reps.json()["data"]["records"][0]} id #回款单号
+ log ${reps.json()}
+ Set Global Variable ${paymentOrderId}
+
+get_order-receipt-audit-details
+ #代卖应收详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ ${receivablePriceIncludeTax} Get From Dictionary ${reps.json()["data"]["items"][0]} receivablePriceIncludeTax #获取应收金额
+ #${receivablePrice} Get From Dictionary ${reps.json()["data"]["records"][0]} receivablePrice
+ ${noReceivablePrice} Get From Dictionary ${reps.json()["data"]["items"][0]} noReceivablePrice #获取未收金额
+ Set Global Variable ${receivablePriceIncludeTax}
+ Set Global Variable ${noReceivablePrice}
+
+update_payment-order-status
+ #确认回款操作
+ Create Session ZTBT ${URL} ${header}
+ ${data} Set Variable { \ \ \ \ "paymentOrderId":"${paymentOrderId}", \ \ \ \ "receivablePrice":"${receivablePriceIncludeTax}", \ \ \ \ "paidPrice":"${receivablePriceIncludeTax}", \ \ \ \ "noReceiveblePrice":"${noReceivablePrice}", \ \ \ \ "bankFlowNo":null, \ \ \ \ "paymentAdjustmentFee":null, \ \ \ \ "returnPayDate":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/update/payment-order-status ${data.encode('utf-8')}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
diff --git a/002-Activeorder/2-Background_system(Test)/4-Consignment_management/__init__.robot b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/__init__.robot
new file mode 100644
index 0000000..e69de29
diff --git a/002-Activeorder/2-Background_system(Test)/4-Consignment_management/台账查询.txt b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/台账查询.txt
new file mode 100644
index 0000000..e4b5b68
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/台账查询.txt
@@ -0,0 +1,11 @@
+*** Settings ***
+Library Collections
+Library RequestsLibrary
+
+*** Keywords ***
+台账查询
+ #获取台账列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/parameter/get/parameter params=pageNum=1&pageSize=10&withdrawState=&state=&orderItemId=${orderItemId}
+ ${台账列表数据} Get From List ${reps.json()["data"]["records"]} 0 #获取台账列表数据
+ #Set Global Variable ${台账列表数据}
diff --git a/002-Activeorder/2-Background_system(Test)/4-Consignment_management/更新磅单.txt b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/更新磅单.txt
new file mode 100644
index 0000000..fef1cda
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/更新磅单.txt
@@ -0,0 +1,84 @@
+*** Settings ***
+Library RequestsLibrary
+Library DateTime
+Library Collections
+
+*** Variables ***
+${URL} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+获取磅单详情
+ #查看订单详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/customer-service/get/proxy-order/${orderId} params=orderId=${orderId}&orderItemId=${orderItemId}
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #当前订单下单时的合同id
+ ${unitSurcharge} Get From Dictionary ${reps.json()["data"]} unitSurcharge #代卖费
+ ${proxySellerSettleType} Get From Dictionary ${reps.json()["data"]} proxySellerSettleType #代卖费结算方式
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]} paperCategoryId #纸厂品类ID
+ ${unitPrice} Get From Dictionary ${reps.json()["data"]} paperCategoryPrice #品类单价
+ ${publicSubsidies} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} publicSubsidies #公开补贴
+ ${millSupplierId} Get From Dictionary ${reps.json()["data"]} millSupplierId #纸厂供应商ID
+ ${paperMillSupplierName} Get From Dictionary ${reps.json()["data"]} paperMillSupplierName #纸厂供应商名称
+ ${surcharge} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} surcharge #代卖费总额
+ ${contractId} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} contractId #合同id
+ ${paymentType} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} paymentType #支付类型
+ ${activityNoteStatus} Get From Dictionary ${reps.json()["data"]["orderItems"][0]} activityNoteStatus #活动状态
+ ${交易主体id} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseId #交易主体id
+ ${交易主体name} Get From Dictionary ${reps.json()["data"]} transactionMainEnterpriseName #交易主体name
+ ${publicSubsidies} Set Variable If '${publicSubsidies}'=='${null}' 0 ${publicSubsidies}
+ ${settleUtiPrice}= Evaluate ${unitPrice}+${publicSubsidies} #结算单价
+ ${unitSurcharge} Set Variable If '${unitSurcharge}'=='${None}' 0 ${unitSurcharge}
+ ${id} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} id #获取磅单id
+ ${status} Get From Dictionary ${reps.json()["data"]} status
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} netWeight #获取净重
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["orderItems"][0]["weightnoteInfo"]} settleWeight #获取结算重量
+ ${netWeight1} Evaluate ${netWeight}+100
+ FOR ${净重index} IN RANGE ${netWeight} 30
+ Exit For Loop If '${净重index}'=='${netWeight1}'
+ END
+ ${settleWeight1} Evaluate ${settleWeight}+100
+ FOR ${结算重量index} IN RANGE ${settleWeight} 30
+ Exit For Loop If '${结算重量index}'=='${settleWeight1}'
+ END
+ ${unitSurcharge1} Evaluate ${unitSurcharge}+0.01
+ FOR ${代卖费index} IN RANGE ${unitSurcharge} 100
+ Exit For Loop If '${代卖费index}'=='${unitSurcharge1}'
+ END
+ Set Global Variable ${contractId}
+ Set Global Variable ${unitSurcharge}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${settleUtiPrice}
+ Set Global Variable ${unitPrice}
+ Set Global Variable ${publicSubsidies}
+ Set Global Variable ${millSupplierId}
+ Set Global Variable ${paperMillSupplierName}
+ Set Global Variable ${proxySellerSettleType}
+ Set Global Variable ${contractId}
+ Set Global Variable ${surcharge}
+ Set Global Variable ${paymentType}
+ Set Global Variable ${activityNoteStatus}
+ Set Global Variable ${交易主体name}
+ Set Global Variable ${交易主体id}
+ Set Global Variable ${netWeight1}
+ Set Global Variable ${settleWeight1}
+ Set Global Variable ${id}
+ Set Global Variable ${status}
+ Set Global Variable ${unitSurcharge1}
+
+weightnote
+ #驳回后重新提交磅单
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "id":"${weightNoteId}", \ \ \ \ "orderId":"${orderId}", \ \ \ \ "orderItemId":"${orderItemId}", \ \ \ \ "type":null, \ \ \ \ "weightDay":"${datatime}", \ \ \ \ "settleDay":"${datatime}", \ \ \ \ "settleUtiPrice":"${settleUtiPrice}", \ \ \ \ "netWeight":"${netWeight}", \ \ \ \ "settleWeight":13500, \ \ \ \ "deductedPoint":7.5, \ \ \ \ "unitSurcharge":"${unitSurcharge}", \ \ \ \ "surcharge":"${surcharge}", \ \ \ \ "adjustMoney":"20", \ \ \ \ "remark":"${datatime}", \ \ \ \ "imageUrls":null, \ \ \ \ "transactionMainEnterpriseid":"${交易主体id}", \ \ \ \ \ "transactionMainEnterpriseName":"${交易主体name}", \ \ \ \ "warehouseName":"${所属仓库}", \ \ \ \ "settlePrice":22585.5, \ \ \ \ "activitySettleType":"${activitySettleType}", \ \ \ \ "proxySellerSettleType":"${proxySellerSettleType}", \ \ \ \ "publicSubsidies":0, \ \ \ \ "unitPrice":"${unitPrice}", \ \ \ \ "plateNumber":"${plateNumber}", \ \ \ \ "remarkImgs":[ \ \ \ \ \ \ \ \ "${pictures}" \ \ \ \ ], \ \ \ \ "otherAmountList":[ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"freightSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.001, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherSubsidies", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":1 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":1, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":0.002, \ \ \ \ \ \ \ \ \ \ \ \ "title":"contrabandPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":2, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":20, \ \ \ \ \ \ \ \ \ \ \ \ "title":"nonStandardPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "unitType":2, \ \ \ \ \ \ \ \ \ \ \ \ "unitAmount":10, \ \ \ \ \ \ \ \ \ \ \ \ "title":"otherPenalty", \ \ \ \ \ \ \ \ \ \ \ \ "isSubsidies":0 \ \ \ \ \ \ \ \ } \ \ \ \ ], \ \ \ \ "isInvoice":"${hasInvoice}", \ \ \ \ "invoicePoint":"${taxRefundRate}", \ \ \ \ "receivableSettlementRules":"${receivableSettlementRules}", \ \ \ \ "refundSubsidy":0.003, \ \ \ \ "receivableAdjustMoney":"20", \ \ \ \ "settleUtiPriceIncludeTax":1.337448648648649, \ \ \ \ "settleUtiPriceIncludeTaxType":"${settleUtiPriceIncludeTaxType}", \ \ \ \ "collectionCharges":"${proxyPaySurcharge}", \ \ \ \ "advanceFund":"${advanceFund}", \ \ \ \ "millSupplierId":"${supplier_id}", \ \ \ \ "millSupplierName":"${millSupplierName}", \ \ \ \ "contractId":"${contractId}", \ \ \ \ "settlePriceIncludeTaxSettleRules":"${settlePriceIncludeTaxSettleRules}", \ \ \ \ "paperCategoryId":"${categoryId}", \ \ \ \ "deductionNotes":"${datatime}", \ \ \ \ "imageUrl":[ \ \ \ \ \ \ \ \ "${pictures}" \ \ \ \ ], \ \ \ \ "deductedWeight":1.5, \ \ \ \ "orderType":"${orderType}" }
+ log ${data}
+ ${reps} Post On Session ZTBT recycle-service/admin/proxy-sell/update/weightnote ${data.encode('utf-8')}
+ log ${reps.json()["data"]}
+ ${weightNoteId} Get From Dictionary ${reps.json()["data"]} weightNoteId
+ Set Global Variable ${weightNoteId}
+ Should Be Equal As Strings ${reps.json()["message"]} successful
+
+audit_weightnote
+ Create Session ZTBT ${URL} ${header}
+ ${repsonse} Post On Session ZTBT recycle-service/admin/customer-service/audit/weightnote/${weightNoteId}
+ log ${repsonse.json()}
diff --git a/002-Activeorder/2-Background_system(Test)/4-Consignment_management/运营审核驳回.txt b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/运营审核驳回.txt
new file mode 100644
index 0000000..ca9a755
--- /dev/null
+++ b/002-Activeorder/2-Background_system(Test)/4-Consignment_management/运营审核驳回.txt
@@ -0,0 +1,53 @@
+*** Settings ***
+Library RequestsLibrary
+Library DateTime
+Library Collections
+
+*** Variables ***
+${URL} http://api-ops-ztb-test.qniao.cn
+${header} {'X-APP-ID':'470236309865238555','Authorization':'${gettoken}','Content-Type':'application/json'}
+
+*** Keywords ***
+get_operation_list
+ #获取运营审核列表
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Get On Session ZTBT recycle-service/admin/operation/get/paper-mill-order-receipt-audit params=pageNum=1&pageSize=10&status=0&orderItemId=&orderId=${orderId}
+ ${audit_status} Get From Dictionary ${reps.json()["data"]["records"][0]} status
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]["records"][0]} auditRequestId
+ Set Global Variable ${audit_status}
+ Set Global Variable ${auditRequestId}
+
+get_order-receipt-audit-details
+ #查看运营审核详情
+ Create Session ZTBT ${URL} ${header}
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/get/order-receipt-audit-details/${auditRequestId}/${weightNoteId}
+ log ${reps.json()}
+ ${auditRequestItemId} Get From Dictionary ${reps.json()["data"]["items"][0]} auditRequestItemId #审核项id
+ ${categoryName} Get From Dictionary ${reps.json()["data"]["items"][0]} categoryName #纸品品类名称
+ ${paperCategoryId} Get From Dictionary ${reps.json()["data"]["items"][0]} paperCategoryId #纸厂品类id
+ ${netWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} netWeight #净重
+ ${paperMillPayAt} Get From Dictionary ${reps.json()["data"]["items"][0]} paperMillPayAt #计划回款日期
+ ${plateNumber} Get From Dictionary ${reps.json()["data"]["items"][0]} plateNumber #车牌号
+ ${settleWeight} Get From Dictionary ${reps.json()["data"]["items"][0]} settleWeight #结算重量
+ ${settleWeight} Set Variable If '${settleWeight}'=='None' 0 ${settleWeight}
+ ${surcharge1} Evaluate ${unitSurcharge}*${netWeight}
+ ${surcharge2} Evaluate ${unitSurcharge}*${settleWeight}
+ ${surcharge} Set Variable If '${proxySellerSettleType}'=='0' ${surcharge1} ${surcharge2} #代卖费总额
+ ${paperMillPayAt} Set Variable If '${paperMillPayAt}'=='无账期' null ${paperMillPayAt} #纸厂账期
+ ${auditRequestId} Get From Dictionary ${reps.json()["data"]} auditRequestId
+ Set Global Variable ${auditRequestItemId}
+ Set Global Variable ${categoryName}
+ Set Global Variable ${netWeight}
+ Set Global Variable ${paperMillPayAt}
+ Set Global Variable ${plateNumber}
+ Set Global Variable ${settleWeight}
+ Set Global Variable ${paperCategoryId}
+ Set Global Variable ${surcharge}
+ Set Global Variable ${auditRequestId}
+
+运营审核驳回
+ #运营审核驳回
+ Create Session ZTBT ${URL} ${header}
+ ${datatime} Get Current Date result_format=%Y-%m-%d
+ ${data} Set Variable { \ \ \ \ "auditRequestId":"${auditRequestId}", \ \ \ \ "isPass":2, \ \ \ \ "remark":"${datatime}" }
+ ${reps} Post On Session ZTBT recycle-service/admin/operation/operation/audit ${data.encode('utf-8')}
diff --git a/16pic_6879381_b.jpg b/16pic_6879381_b.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..285f95727c5bdb074b762b15d24e92d24471be08
GIT binary patch
literal 243901
zcmb4q1yEeiv+feyJplqN8YH;e0>RxEw*+^0ha?1oTLQs?yTc;E0)YU*7hPNei@PlL
z_V@qad!JO@dhbouIj46{_w>|m%}#&)^*qf#tpSKs6qFSJD9FZv!T|t0tphIQ{T*xp
z0CjZ$I{*N{0-&J~0-hly4CEz=Li8`004d8wW&zNVPZZ>(6YT&%`w!U|`2@(mb#-(7
z_nl5&Qeq!TF(I106-GzzdVs4Klh|y|3^O&
z0FZ+7U;5A@fq&@`BXySkYjgmB4k_dC@$d?W@$!iA^V0G1iShG`@rok50er{{MP5OW
z$Hj%tmYbJLfDWvy4tRnAWC5tp{%QZ*QIQP|1MQ!Ng@J*NfsKWOgN=oaje|#shl5Li
zi;ay>j88yFL_|!4gGWM2LPUy`iT)V`-lSV^D`RA+tkA{JUj)?_$hKhoXd~J&SRgj*ap`oFoqoZM;FxJt(rKQx#Z)`ItgY0MxDb+SB>|r>1YvvJL8~vOF}dIG0l>2
zknhzja?EgklkZ~FCUi#x;bKUWQGjiuQPp8oo`nk_uys7x_juJDHBtlRuxf}7?}};^
z;EDy_!r4LhI9@ee7~V-F;gO6wt~U52`Zl>%7B6W5Cuq$cAY1v87XJy*WL*ccPO}Zr
zVmhrS$Qk4awWQG>k6BK4fnQ3_esP_HO6z8p0ncC0>PccDtHjy+Y-Cc+eCs&{P><&Tq5iV1RI6hw8O@l-z)d?CT
zbQ9d<8vE^!2h9Jy$N;fB;Z8Ng=jXne6=WK^#FD}_uP=&fdR5#YW}L~4`Gq2ebHA|e
zF2SOy?CP>1of(`4hUBOc=UH4p&7kqH%~ABMX(L^H>Qqlh`)x_uFpeCDQ(SW>xo-uI
zK@ytjIw1sj??ZLCx3E+5xnF@!=*`>G@?s^uJf24Rc-e?V
z#lbo$jYR=?|HUPl@L{K-iq($RWD6*b+Y6>EtZ{|T*#g5Hn*Pcl*B__2A$c=#1?VoJ
z5r)9tMv56e3kUdaVE70wwhZN#TV=}V_O7C?%62@5X=_b3Ijv9sf}KOZxoM@7So_j0
z0;u-o$zD$f-n@J7Zb%KlEOn8|!`JSE`evy4+xuHlixQhiG*XOo$3Eckx
z7F3t!nb3a55Vsv*HSuVi+%j4NyW@PNB4LId^uI-?I$;ogC==Q98tXa_*>E_fXZNd7=)w94rD1R(FpEBn?kT6f5|>PoKNKT+;VN$EDNCtH(u27qqGglOo!en?F==^|rvl|_F+;I%9@icQAW%9=Qm0!FQmslBA^8N0|iJ}2W
zP&j>#COZHAax{EF~vn($GD8jaj2gclEt%=Knjd$
z0G-bV-tDrK=Uh;!cH6O
zRrME90XT8|OsM&~0CAF@aMInTKIVF4zMgR<+g7N&=XcE(VE4`5k0pHL86m5;qk0*P
zly}$AyOWBBWOq$8G`!{WRZ%KK;5BAWm~(U})8Q%$6dMPiL_*a4W`t2{To>}Q>7z?L
zuQLW3t&}G3_$5^N)QE88c^gg~qfolDBO$pbM#zsRz|FpzN~3^+
zqQACSKj7SsVg_?xkLgn3SgcO>ea}FUA62(|ZC<_PVgV>9k~Of+#cP5nB5xB@DTR@bLttGy4^nKu}=XHnNwT{_fb
z^AzXQVIUfo9vZL{Jz4?rBhaN*yv(OK@3?6-%*=;qgx}T7
z-@Rd`4A|hO@Qs*nG!KeT0AW3abnDObBE6L3WxdxIvu2vFa@d=O3fJX}%nMS%B7Xia
zD2`V%K+T>ir>Uc`u5ziL2LpNKC;j0K$`t2et5h8|6{fXyEWmLykko@MjlwhlF#-gY
z`T?Gg(s~>xhG>b9GZZWDxOz}P-D&Qg0J&Wem$pJ*oXye+t8obsx99R`WNFD>giLWL
z8z3polD77)fn{#@(zi2oOS4~2{@AmB84l45CfupbPus(%;brWOpbfiL=<=H{3O{n9
zkxn-FV9k=q5w&{nb0N9PBF3)&cqw5w@&sU=xiINXoe5SHud=&x?xU&=d;XdlB$VI!
zJK_VUH|1UAAaJwtjrzM3IH^3F{f3)P$R%d5noD}y{QlL9pbv+;Aa9bu=z>{jlqieH
z#hludW9B#pG*xjNG}w9lYP(zrzni+tuirza>z!oL9pSFP?et2DqH8zPx7ft1nGk8b
zrlfk_{;*E^M~*P=arsVh*z-G=+k>mU0GmhyTnn#kD;D4f!ksu2#NJ@9ZR7m+c;7=R
zJw3fLqfCQTJ4ows_8q=elW(l>@@+{^7D1+*9RE=&)h`TxtpR_A+7@?-L7EfEt}MRB
zh03>?Y*)>!A1FTER}=zE^C=#J5cW?1$BUNZ&=@XQtTIC)S_Nc7wKsk0<^8$h0s3jy6+h+0qi#Tf^wy)zaNIA
z%*@J?e?-!Z&mPVNEH%GyqJjJ@5Ls)uV%nLb?NguWv|4SH?qy@ZQ>+np0AtKol<8R(
z!st8f6F9%Wl>4O5V|a}zxqRm&ocyJLGuhhu^_ORYyl2Y1I(8cUG!#sXi1Pdh0g=&6QN}5L4PuplwGjD^!7a8?re@hI7
zp6>*@znn|(DhIe2iA1J-_sEmIoKw2`pn{TR?HSStFQ2_5%kM~zg&x~#sqa;--3fIt
z+n%uioA-DxsM1pHMh0Ic5QT2-OVu}X&%dGe2gL?G0YFsSdpN`w3`VTi95vQihbAe2
zd;hscoIa`|KA57z%lIJr~RN!PLf4v{F+CU@N8<1Tf0nl
zBF1Xh5H$}%#MIt5-rhiHFSe);TqGTE3+M@d0jN;_!WGHf|d
z(yy3*;N8rZ_D&YnzMZ-}_3*FQp6_xPEki{9b&44RW&8oNdQ#E{a`QRhKQ1hT)f4h*}wMwV1O0T`B?w#$`D7&sb9Fg)TxN4SUJ
z8k?e)envi&zu=(@WWSx9n7@t)zV>(
z$Xc4@TOktTzUk1JIyuO0PV3mr*M)Yo_1Dl$Znf_b{%^vS57Q45
zTi##0E|o8|3?KHs(V+F8QpD+-3ulqa@QG_^?rq{_>97P5s?{3cftQbnr*s3;@cTE9
zLcDiCt0gaKUqw*53ZDAm;&?efhDKe^1>PK+q?QnyI_;bk1vZiRGnL!?-K4y)zyFxk
zax|77yDX9r_gX3XkAm{y~zrzppAaz_gJ`_WtZZ!b3(rKF0_KZZxQ%%&Nrf!``dAmTvHe?{M#5
zUOfhmR~f`imddxtE#N3{lV3)%ZU-p%f6}u?y*_*tGjm>uEdQIaqo2gy1=f*n(+c|$
z6q=Wt4z|5)B|1?+toYn
zB3zJ&NAN;%?EeG#OiNQ%H?KVbXoCI|`yheL|1R#Yc856f9#^McPGBHLZR-ejB*Up6
zLl*&~ww;U#Ui;w+Em)p~5$Be151#&UW)Z9ORu%zAxg~7fsvZ%a6E}+=17S^NmuSDN*U}y7yS(bDUBqzKO&_3kmtyoTFMML!i_H
zs`J{<$C|Ec=2NfZN*;O_TlF8uSI?ko~p12Pv|9~L
z76_1YW!hXK&0&FgcE?$wApxICD|j1oxj
z`1RBGF6`X91%?wqMsRzWLq}7CQ?ke;ibhzI3ID6`o27nwblr$k4dgCW@}ae#}f0%h3DHgtzd6ruzB|DN8vfo9O?b~>_JF?fNRg~TuvwQMHozw%j
z;pHDQ(LA_qsxt&T2k&3vR3aEA3rXVCl^s3;c_Q+spR-JI{l2Rc6h+?8#gm
z--9=j%TIuk5}heMt1_4Q2d?(xj!Fxz_0p6Q+32La6`~+k)JgvN9Fyhr`f8YKg5bw2
zflxYHBoYB(gfta8yQtbO7bb|%gMCc-PXT%3G)?HUV?T_=eBRs%Maq}ALv0vh2$ZDY
zMTI8yZ5A1f$Kb$jNT8K-R!c*LP&Pd_g{VaRyp^8$EffjpbcMfmxH>`vN@Un}&(q_*
z_Ppj(VP?WP8{2I*S$A#ww8ohz?nNo}cJqXgIcfd&R{60P($wdu-EDI~?Hovn1kG0-
zre@U?H13!o&K+J|U9T&+dMfd}WUdFPuaDvpi5t
z_~D)UURj(K3F{MJc~&IdMtFF-AMf6DQmLaQ%Uoq?K#8{dXz)>t=SDVt&UNX#FLKsQ
z1oM|vWH$qn1l#!odMeSJ7ZR8*qQSs1JYfoK=8kL0742%q7GFEg6NXWRdr=bph>Dk|
zn7kmBs_Izc(d5(vfY)kEtpj=r7!9RQPq8}IBm}IhJoG~`nT)VsGiF!n>ujga8Rf+)
zsmTjo&X)yQ2h$K@^Yii^t(0IE%EG7V}z<3WWr^Hlhbvr
zOlgtb8{IT+i%?qdjU=t#;q=?1zsv6?$6}S@+?X;SNwdo?t(G2|oVpODP}geH3O1KY
zPz`iJlU7HT{0Z=$5K?z|Db|%YM4-IK<+VW4t@rqvl`}>C?IO_-SYMWbgAw$=r*v^2
zyD$Zo#hQIn*SpyAE^}qnNQ*y&?%>dHYC`9|rKL|=TGwG=nIucT+tXe{=v{M~JXm{F
z?B4W>VMY|bsMB@Fm6X$MNSY>`jCt63LXT3XjTpUwDk*^X0MX(G;p
z8q$X|^naEQ*6x&fuKRYl8n1q>{5r}=ouD|}oiz7aXegt^I=7tK6ZF{j1mFZ}AJV(n
zNPogU!VU4xen3%Z!#sTHS`zw7&*ljbO`FAA0MkoztmY;kY!P?@I5ev=$kge648TAI
z`0r4P@zouOWld9GqQ+7aO%c)qEyZ`vp=Rmk`957E+B(BclMDl+{k)i6i5xk?IX_4F
zv0$0NADGh+cZ{%_qL;MuAHQH^K05)&7rk9R-G|@qW@SvOrDR90B`RJ3NA&AkRI^Np
zKVB?e)EoAy7-lQPX1CssJQGia$JyQPNeS7f_S+|?f5HKKBu8D(gs)!2`ZldlWy@dy
zE}j5?9odz%e>AXK3Wib@1S?u*`+k~hN}Kx48!?jj7UAT7;6cAb<~8^`kNxy4>h{jQ
zaeL+yUYmB_AE(vSI7qUBWVbpuHu*+S*!ehT+
zQX1u6I`wj{QX0@lG`Q#O|8_%4OK-u-_jJ<%Me2Q=C1FYHs8f-&zO7|X2Fr2;;%Xpv
z>$}#xC?jpx;$H`V$ks~c)%E0eeC0Z8WBAW<;~4)(a#Y%tl`N=X;l}p+;g_eVgIxk@
z(9sc;(~I#MNNy5`@o>pF2e&ItllKdbjNpY{(!=`PQ#{H?-^bU{CrNhAcI|)
z)J7{32WU}0iPq$f>8g!-@P^7Ii;dBNT&o70Mm(P&9Z|F{KMV2(q3ar{!`v?
zCzW=k5Oz5w@{648r?Mli`a-he`tPaEWpcl(jYB+M(FmvPdQkWg;q88!*5YjbAb2^&K5Z%`uh;^K`e1toz-LU+kndqhF
zS>1K>x;Z037>=4$p=Q83eHg{^D5mUKtgYE=fE#C}(cuwno;b&IueD_9aZA!B^#?9k
z^g^>F$T6kBrjrkP@Mgn1%&i`@`L)z-1dO>cJ56Ju55G4~s%x&{CY4No~En7X2Ai
z70|=%DQ*Y+;v!@&EV$CJXJ3}45bG}$nQ04D+idC3HilPMIM#yS(ELotS_)db8siHI
z;Vl)nQEwx0>=iG*3>H%?YTQz;N=WU3(0iHhX~yhe^N0
zvtpT>50OOt^z@4V7wi^Xiatn<>!lZ%lo(d*?Z-!uz{#0hTC$Jy
zoBYF{R0`m^J}iIPg(U_%4V#vSEZNf)x6g>$t|jZfI0zX7VHC0xR2+zX`?CT9`LylC
zD#&M%g%Sg$rWI;*g9#=B^%^G_>$w|U2>fa$s%J*S;Rd)Gc^yjJpK
zsv2yjYOOJh0=}9V&KM%a{lekAbcpYI6qvRh^Vd!$D8LJLFCdG?fc>J|*-qy2jQ@x|
zjM(G-@1CCHLNT0It;=k1vdw;auPf+tCx7O{#J`78xAq_=X2q~pC;uALdboPV2;D}dVd@JCS?#8j#fUU|C&_%8UjWs)nc0W9AJa^Pf&6``b*zo*0uLT6a??9n=Jw(=tSnIsB=^tMa3z`yf~Jm^E3c)Ed_K5xuBX1W&z&e8MpaOrkntI
z!U&BnHUPsli;}B>V7kgcFN3ryuar7~qoS5iVc6t7cFJg;mY`|-`dqK`Y0Jl%x6CF9
z+zbc>!Zs<3mLL12W?6Hp4;hP|*p;u)spOA{LNr$o^ShESV%zU@AeFlgOxaa?W-*{~
zzjuTe&|z@HR@tEbafFnLn5yUU7nI;Gj5P5Wz*iCr$cFQs-+|PKe$6jPHOx1e1Zy&w
z3463NEy$@jW7@S&i-V`4Ab&&@@i3Mj+8r!!A~XZifWa=61%tk0Vm2gJT1_i+iq}KR
zr(WE@305`<3~@=Bvr2Y!O^vKC$lKFwhzE04x3XVLuBTkKIb{{JTkr&5X$;l@)fI)s
zI|uH(%WB%eAh|PMTi;8oN7=)It~@POUH`}&(?%gOYD8pE;>p}A=ju_#`nf0)E$A)K
zFT&2ajXrLK;`jF9E)uBIG}wM|hv}8AO_y!vA)!b$^tJpR4)%tMzMht79nf{nPFrX`
zL$KS#Km-{kBtlBN1TzewlQp8IlwtG>S3&6s%hXLCsLW*cnn2TVue_S_Jfnlj1<0s8
zhoyh?R}mJPZ>R>1u8(J<&MaLHR&>Zvo~lHO)H{zJ+8#dK{X>Brb7@Cv&WuJ*=R+Yu
zuKHF9pLej*w~|?F1}^@qJH-C3Jis7)0M^UXJM;O2S=ACAiR{vdMN!O=E
z3J{19QrRCjeYCErWLfCJ)4O(|jndRPpinWm113
zs%bGU3nX%8YmZ_Lu3K9Gz8QgB4CHoEI8wXb_K9c>MHcR9A&_B|9o1<(vm4RmX)cNQ
zc8fMp$Xy)eLNmngMz&(qW&qQYazdE+a>EC
zplaY92;5lV-5f)t^xZ>>|8OuuWKJQZAagw0cha@}vwJ}U%y%mp4VMLgMO&0;F)rpC
z^Fyh?=aC5$;n?M)SRvpyj9-h6J|LDf6NA-fU50{WZd1#zR=niZ$in7Xc17ZyFoP+Z
zrk5;Nc(6;7NHp)z`fh6(2^E%xiTnYH?x5xiUGEt3n7EXI3@ypF
z4WIK`ce;|L>i{R^6ka1XrBo(AXGG9`YUMgj4hx6KO;{v*XsK})!x1y*7s<@u*Vkg5
zaZ~zg`earaqQ5VWPx34Rz+KnHLpzQG}k8g)#6q&aLo4AC0AiKh^
z8nN(Wml?z!!rU9YQM{bZkxHd$q<(amV#=+uxVl<`d3KIn;tTZR2(wTg!=^1Hj=Xen
z)72&$H07E#PHG#Uc_DVXvXIMWHOHVWbaq)7+g4|(u+-o+o`t2+_UU~O*RY4K#wfdpt#)yc-(0SUgm(U2>`5zWa
zCCw&_DWB0rX!eFXc{xwqyfIoM$
zD@2Ne#=aE2eQ7}J+hRFhylgAP#lE_8R+HEFngw9rHQ4yBM3y5`0Lxu1a~xg}i>vst
zAWKXrO9s#*+YjtsRruyqI`bu(9PC+HkWEILSCZ;#8ma7#yU1A!7Vyq!<^7$!!FP2r
zmQeK|UKQvCQrIlE}fp58f84FQ*t!`+G_t)5Zj)Mg|X3B_tnpS^~-!Su_PZ9wz
z?e~xfBGkQ}GWeE7(1%~6JzG9za-8Gbxc%b~fj7RGujTe&(gk8)U!N|U8sE+{u>n4ZO_f$|LkqdF`)d}bA_ztq-9@G#zra5$MnNyj~mw-)$834S5vR+CQHZ(0<5
zzh@)RWU_aOMj{Yn|-)WJDs&2lvc9nJ&13%nV
z|1@ua;ob7qxyytSd3JT1$@4VlQdq_6%o=ao8J!OO+hH_lEkGX^!O*kzW+J^r#l
z;Dx0yc7oDiX9T$eV|L!TeOPGX)#CH(jZLW$&6W~|0vi@ds}j)NVj$)dAf{7_GYB(I
zScf5QNFgHc%g}Q6ICaES`HicFe*+49Og6tv#k^ENGA2H;#iBE+ZEOSK*e$!LA+`
z8<@9_Ey4P8`jf}FHjX?>xu1TbNLEQBcP>t^%h=O)F)^0Ecb9ZKFaxoe!panVJ>5T)
zgdUf7yRp-Ed>JTYQ|BpsVPLO2E!@qiT5Q5AY;Zyk7`Na3yLuQv9
z^+ru7NmIhGXq^e?C?@1v)-}zPH3hML_V>PEnUh^k5T^%wbHCawihnW6uoebVu3wN(
zsaY^L>G=Is$`p~kC*-9kj9+8)mBbqLVyqN@oh+=Lqj8Wbl9oq_wvq7JbI$7W-{57k3$wQxHV)3$A?HmmtqV6o!Y$~xo3GnWqzWhR?*OTGNO?3E8Ih_9^nk^0$XN8a2J7nzJbwP=npX=n^O
zFxr?;{A&Dc0z;4oU6U5U(Bys+*FeomIdnBe;;=zkmTVvyo^8Fq@R~%-;Z>Fe0U9M|
zHl95S_~&2d;i7Chjf4Ixv056}eNUb9MRDc0nUrnHIoSC?(q&$CI=OC6aRc*?)*#7n
zPQR7NkeKW4vE2Uaef+bVQO3sSzPXYI^9P{N&hsm%%0B_}z;!T|nEI5-2gDCE*Ph=;
z;6Dvqo&kOXLDY^DuB-NMocVC7G8;A`7`EC
zRo9EL6~k@j6&1c5e-`YL$Gab?2pktGj>azeGC2QoC^MymcJ1i;^$o13j{XhMXZS11
z^K32s3=wfTC#l?Kqgp>1iz5O%0+?NeY`P7kUpwmJK>hR>@i2nyU~-)_U*qA@h4?$b
z4RONlf|@QEH__xTX46*!?=h7UFi?4Eo&ZV5*U*5e*ukiv#icv-s0(05-R~zrd;Izn
zz(js{FBe+U;bM}#LPAL_SG0+VI@kReA}GuHJuswKW1enMKmQsbDR>d)F5}oz{hQm>
zdn_QVrpw(xU~+Yb`qR4UFi*()XcHgplA^dk1BZTuc!M=Jgk!rC&IrtN(X0JzZP=cc
zu*K>hLwQYMW}N%A?VH{F674E`QK&39Xp=ULHh)q?23I~TCigq`W*%WeDXohW*avHYz>^T7v&l1g6n6=1ja<|YX(zC)RC(7i~^X&LZPb
zBJ^wq)c&6J_`?@=;=?BZHgf6f62^YDiVB`q6^Q>S-IoYGHDArBu_hrf#GKK*am)_Z
z)@wGuEztz<71V8oVCaRFwCr^~x0=4U2H9t9-PQcDD|bs*nU`TdH)=gj!>5|aGN2K+CqlKA?s
z#Tp;nZ<-bal)9KQwM|(=0h(%
z)tPO)%S+477CIrX=8V7jH0%iAo4r&Rr9jk(he&~NUJs4U1#5iYM^=
zHkZOB=PxF|C=?c!?4?KK>x?qL(Ps+LL)N|6C5|M^{Yd9<`BKu?u`kIwV*dg57^
zw2)$m52?Z@a|PVTEaD{^nMIg6Mp>sh+nOF)(ilJNavDE6)FkkO%R{+c)hR13-I7=&4?
zFRzpzUc`#9faVfLXO;f~JsTP)o5Xl9l4bek27_U1tMzMT?#Jt{HXN0cTY|NRp~-gz
zTfms=F7aQkXkp0Q>J40Cm9$AoRMA;GPh)fXb}vWSEnCEm{H|_{VmE8`U5eptrfE1z
zFUuUf*qOCa>t0)vKdq?YCa$X|Ude>CQrKmD*eRz)jKX7kYYjLKmU8^cF;mefJ7i0*
z3S5VtBWZs!HbJoVNscI>Izc*K^_#qc@DQ77=ho5luDF2un-~_VHQ0ucL_vEpa94T!
zd@NkP2BxipC*aBBGtMyBCAq0m(4_NS>Y$+_aYLdt>f&O`D>$Qm0G{M$zS4MSoj#yf
zp^|3FOu5l{9+x*FHLktf6}#i^dS7gsLg4@5aKG@eeMVo)ob7M}g-MoA#stcPx(fd|
z!Q6iAK@#g@Fw{d!B;^+3ZtHt+G>}pxqHA1kgv*bH{th|YjaZ!AMv7p!a1Xxe*o>ohux6Z`$7`$(a
za93T$^9$gj;ahPWGb*U~5Oa4M9X5flAoX0|p5=#&(}#B(S%%w*89^@qzJuF2RKYAN
zr-x<_E?hKvMXRO(pBQB>J1B3TrqN+W!@2
z`99wc0+}^zN2`<5Od+qO#E4j$vKg5$e{y;tli#IS4Fw5tfM|4@H=-uV?zad85GbL2$zWYmRsgBgd(+Q0Hpq!vu%1PeQ883KhyrW||DTDF^@e_b(0<-bM
ztwYS^+C0#FP%GnzJWUY9UXU28#%)fDah$l^qPSC@74!jTT75%bp@OLXJe)V)02rgb
zk+BSE=Kl6>pSU)^ovOl5H#z+4`0AVifl?kYw5&eO`||DH_wsK^ulos06zB9l2e_!<
zkNPg_J7&Z?mOELODh@nT>D-_T!Ronh3lRVT2e|duYjZL-6+RZdKY1@|i2S=7@7~Fw
zhjmo6K>RiRy7a%!BIJAsbBA|Mlm;KI_Aji8rc{$YyBvLjgfbbJl~N1p-P11p`Qh4Py1M_EKwhT|DJB#T@>{tc+YZ{E>@uEKXF0MOPglCT%MQ%J@tLlIWWit99T?Iq
zz8z5Bd?deST!ObBhnBbhcq#0tf<^?1=BSIqOTAINvD2B;Xn&(BFH0UWB<25RXoFAr
zE=lA2Xy@li@@^Oa@p{t8=s7$r(g^SK(26v!7apN|-|8g=RUO!8)}_$-Ha0pItI$GI
z4gTuyvPqcb!lFv~yXc>Z!KDMbMN5{|@hr(u
zna6IQ6_<6is}6LJgv^&wVv?w9kHm>@u4h7un&!-z1Ux=u86%V3OL<4}uZmQ2JXJZ!
zQdIHqf2~ql)b1A?rGr0RHdH7vKM%~T2g9q4yVHLpra@7q|`^nxWM=tm8TjUY%`qw-T
z02j1~m`4)w!c~6x!Pa;az}<=4eyQd!eeBYhNycD9y2??AsT{4VtyMm
zldgY75;M`P&SoGt6%mQ*#>J)y=)FKK|En401wm#%^mhHkb||;Ut&?OyhMqab%Bv7O
zAHKu3xi)U;<%cH#hR^vokAd>`8tsB`#@eK~C&1`_ZJ}Ot?lK+q-__JSul4;Mu1kZ`
zl^5Q8p;T~w80B&HzDDi3oOkV?$*@3`l~)4|#L1tY5np41M>Zve%?@40{3Xm1A0{8O
z@(^r#ui%&IBWDbJRiSHpKZ0#dC7l9I95Rh0SV!zG2AW2@fIZ{5RsBYd?>_H1Q2zXI
znnV)f^&1I;q7S_d>R?~8GH$(TqFwuFn$K(P(T#U07>Qm<^99*u?eB(;io&jzuAZSk
zfP82e&KlYW|H?bueEGlzvDW3G&g75SQxGTIDOruii6KC|=Uu}ydVReA2tpPToN7|4
z52^A<69Rs84!R;pZbCCC0wWZb_{=;-eJQsv5e}e+c#BBoFbao3du#AfU{d3VJ)4`Kr2#@rEu%Bw3DP}9szLcI@Z#Wl|S9@m-iA)^Fc
z#3w%b$Me9)DD|cXzGa_gHw$J)p&)kQlI(ZzSLaov=Ot`}q&HqQf}5;xrTs@}aru#a
zQ@yMmURqsM0nA`$<44Mszm20f^Pej!xF8Hxq*=zn*S`UI7qhRS!=suS
zB!Z};NJzQUT~hKg?B~@<7NnAQR902!e4Z0h5U`Vx6_CHc9hN51X3yhgS%Q0+l*
zhFU#)YB*!}<8DQ1u=b=ZXw2WRDUs?7N3sZkkECd)KLieC2+-DlKYVO&5cey6j^qNI
za_}?eQ2o~4;6wbb!5%H!+KMV#HHQlO-YDN0Uf!c$};@sf#`EQYCZ6Qs|vmDCm`U%P+J!1r#
zTRx76{aN*9U8@$T>9KcGrS2AH5`k%5={-R+JTE0K@ayeyy^h~}P{Mhw72g};bXA6I
z5=lfDyy#5l@`WoWwX{t0@2XoVbqw(1Slf{pY`*#wzLnJEf6oCpEa3cRWC&aNr4w8C
zlZ$98IqtT8-YMDT%c|I#!9=jAb6`s4b$GP0;F(1UoqMClh
z{StVzDe+Az7l9mj9bOF>r+Fa8w%E7~lvT{oRtnBz@{vyOk0ALif-
z*Vm*WUKhu^0vR=v8ZRXIvk7i#ni61c#YJ5vmGn6gu@$d=qgi@VLd#nQ)>1fqeh%Sp
zU__MJwf(7(sDBol??-dN(1Km8J>tsRJ3ytQ5yD%^ZCPBbDxf>v6Kh+l|E>^vdMOrT
zgU)WJhR0Eh3^{3>6kPRDxfU{!sPPJfA+?c|igF|>e$L2D*b`s}%cpEPzD3-B>(PXIT-7|EY
zT;|!RH1Jhqw#a9zOd6T1;*?rA1e5gRvYI|9qz~GcXUV6e*(Gl39tkXjcA8aBkGK@#
z67YxuwafJf7G-9P<#NNaa`XkxBCesO(^#qAFkBtIAFJH-NJOX>2;37iV=ivf_+wMa
zVY>A&Rt5Zd$pO9aIUVkg&~gXWN9vEbPi*SP;-T
zRc0^7OhNe3bel=^QV7^@Nd0^QoNHg2L(i?OZFqfO4G|`_J?zcLciY@HBvA(Cnp<;ysgkv?`SP_{IO|KhOu0%pC7_Yss^J
zeRxu-sfa5|8#l5SGJr&An~oQ$zQ+pK?_lJq>9*Pe71~~jEZsLwe-bFS)@i?u;{`YT-bZpDL6`~u7b4{PWEXX;e}9F=JYn(Qhr0h8
z76ik|k}t?_wtcq{Rhl+Y19AOtz9e`4>OabrG(>jlCouDa_LprtY1;v{A$~PKN*?kH
zRg2a1)aCvp%d=?;1*ImMp$#!zOx~oJ?l0HpJ=in_ouU%IJQ`wUBvjf@{Jl$CAgI*W
zzAckGKUUrnqs-fGw71hTtJmyes7)G|^#$R`wPIUCljGuG6~MR?ZZxz(7`9)|=;=Do
z`5e2vph-`UQXAS(^K8qJvuY2$WT(jzGD3>Ymf$}42Mf&)nEP?rm8>edCbd|wmkP(T
zNC|uU7XAeAG-xy_chrBEtDWsT4N^j;cle^%^y5#yD;?iooP%3xgxT%Oh-KfKue=NE
zaZ~|9GOk}nmoQKzGtLNT7actGT7$BI<$%yO1RPVLWk!C*#9~Z~zh6On!4pL?`rdmy
z36^d(+V#U3|-GVy>in~K`D^Ms9oZ_@VaED;UDPG)zOCiAu
zMT2zne`j}QXZPKi{hDu2=9%Zd&pE&AIy&holP|NN9cwIjCga~aI|3X*2kB5;nj(47
zrp=~WVsQPfQ}9D)Nn7RY^u+Y6jQgO(?ms|ZcW77ou_biv35``s4dEu0Ca;
z2>IiI)d9Gx^liokEYnTrxuZ@h(Qi&H6YQyffc`RM|5*mOz~p4RHWy;%ob_g-ULXYOty@ljmX`8?};x
z*JE}`PVL9{!l0?O(`E%_Yu0$1ALRv70z&oGZJ7CrZsDN@Vx1q6&*l%;jp$21B~zQ;
zg^q`ya96IDT4<2j(dAiDvV^*H0x^pih=Q6}lx1BvY|-J+mc@|qLoXF2$Jfr*cE>gT!eY(`@%rN5b=OQ@3O&v`I{9ES(qVIP<1@VLj#69%
zbv;~SUz}I9XjUPgXfjy@`rSXSbmYl>S9#1|@YFLA?k)!WcC$DOO*8SCu)WDA0j35Yk^huK-!yKbj=?t^3F9)KS?o(9}nUx
zRuU*(aP_MlNUJ+ndOlHeJzxne_WQt_4}whXz;&(cI+!P-qWvkOCjTy&nLos4dr#hZ
zN+cUTaeBu4L0N$PIqFvMZ*4gv(}v#-9P-47;q>q*(CMIN-Y279Hg&mdDkQ`#=nC1%
z$?HSqK1t}G$=S`7Ug&zI(m2i)GHqUSfzp+2
zp5q$d>l^52RTDRnlVz<97;ho%XCpVVmk;s=s*0TT@;4ih%sD#qS$*sf@9fG7zq_E9
znjgMFoyU7Z7%uJ{t(J4J-Hrlq4yyHUivBFpGNA7iStnS{ADgY`#)~pFKtR%csQ&Rj
zrk1OUB_~lgFU184F?bBCejS{rBklS<5%=THW<>=SnY@oMuKgfWHnVd88Q?(2|75LO
z8dgzQ-Z4{^Sd2;hbO6l=yXjl(DMdSRxvLxiqx7UMXXRZIg_u5KB&O4xwQN#5vXfi*
zG7tpwo1zL}49|)jR)dSCaC{44a!DA}>^P`kiEQ_XuLBe^sDvl|3ucX!I0Jgt`{d6f
zOJe80xM5{pnYrQlxdNr|6Evnx^CEVDiyFED;ZOsP)UrR98NWbIT%az0rOQEa8n*9;
zdKscJbDEP>ufkr`dKEsG(yslo{cOx?k#b8=eDq%Aijp*@;zCEQ#O3^>vpB6)SK7P}
zW%kn<=58hee}mftlbEN6QO{E{9Q{Cf6p|7v-~3`}=R0aL+ErflIu*ZUpzU(LmaM61
zLxN~NytOY<^jH!&+?z)e4jZdN!3Zs%%8H@@s@zj18Dfg0U~#8+(*e$lFN|9VXLb2&
z*}lKw!{SBLZTpmXNTEK6-<+aPRb^fU38(U?Ej{Bt2BeVkou6DHcZLlo8B>6hOKshC
z$Ybm0teZaqcBXau>p!LPAFXJvqK(j1)TPlk-ufx#*
z0Z|doxbA@0YWAIJYU>RN>AkS~f^mH7sJ0}D)0BbqX}!cpPq5Vd1v%|#x(amAMEpuN
zo9%b_oG#q0l%#-Lt&LdaaOvtO+jPs#)k
zlVP{)SM1EyH25g`{9+cQc%A)p;90^yz(>XX14(tIH5qt%Xrsbrb-Oxee9v%j*!9q3
za5K67%!;iWDRTFN0n9LT_prQWX?Lb0*-ZUqkJ8`ywhRMNKi^&OB2z9>?k1qsY-^**
zB!Du_m?}5kRyKctKI~f9kfR~bhhytju~5XYl(9=ZbaTmB!&gg5
zGJduqS;kuuQnhFV*mi6@kDeSCbQN-R4P*YnuZibb*V-GbX88v&b)o!yu|we^jlZAC
zBGK7gshkDxVC;ws~^7r%*<6#(hg41W!el+is~eU^zckx|DPw
zP*r%&0Co#H6sEL|^ZgRp><)jwy54|oYs8{gV>5|MZSxeEoimFfBrPS+v
z5F~mprP>@|)mj!53Uajez~q&5afrWKZ0fT9;8mdR450Zug$X{RqU;*brBB}BF8$qJ
z9jjJ}L-$1@Yrf=gj{T04*EBr~{1^(YjGUp@8srIXPP-M1!Fbi@>4^nO9TTkv;LH-lc(vVq2;ofd5H&UN|Pu0E4;+(|7u~9YdfV
zFRGVsS>c9E`8S_kXLkrGOmC!zc$mmCw$Dg)F8L
z*o%l_UI5w8p5fEf5yAEmkG8$l29)gI@b$4qH_>>
zpVFuQqdq_|p>pq>{;PDTRYd2bDhlro-2oSiUxrRmhc5roM5Q7w(Io;eTw=(mingnD
z0o^`7z*x;a#~?>J0a&^2C+c1$iXH{~oS+?30h<=Si^AD&mSsmP#@!3^cOQ)psCWG^
z=3ZS+E=rLeZY$Kgz-Rh(wgjp!Cc>Xw&slk|gI!Db=8b;iK4DGur5lr{(OGwDM=jGN
zzL}a`+O%H)zjqz#J_k5d`mD5~n+KC)gYK=g{km5y;*o;dC!l_-d{s7R$(L|{(LTc+
zIx`tskZRS{jx|4diM798pdIMa&KDhMb!i{T>th@UD3KLiKNo?p+x-K4w&&Qwc0M*<
zYpyHKXs&q6ttD_$yvuPLjq?u>r8Kl(s;`<+(49=b8lcz4b|rD#1h3husMMDwu1$-t
z;ghkk=&HXp4RoAt}Y%^?}bzeEhY8R@;6yg{1BEn^0vj!6x*)SBw*ueIm6r@~TTueYsC}n+G)^~md&%aJFENf#HaP*YkR-)_UM>%q|
z&9Am3%pZx{isG?LW$03Dww;jCh3cG^_^H4rPFr)Z)}n2T6kagJiF?p|*14YBpVi1R
z5ejZ#Z*R3C#mTa>Tn)UIyuF@tW0hxDnV{iAxM0l{s>FRI8`^$uwQ+fR5c+n7^pMQV
zIR~GuS|HtldC-TAl5J!XErR3<+(BnqA>ZbBnz@EdSyX2>
z^D&{Oz8(Rkdo3%J>}m!WFe_4JFWk@y)9%!)8W_2fsX)srvi_#7zPZFL(#D#+@mlRT
zpXIuOda07|QhbQ_!^Qwjb_DodP&%##lXo9Ie0zOaGsf2vCq)y@6G&IOp%dYgcp+xv
zTDbhWL>bSNIf>OqvyBynLdcuuB&*M9E0Nt8G|bM9gw!wgq)f`|FsYCGJu_eYdsqX9YBr
z)5$Y*hDxBcOI}>#z%w#TUepVU<5q22Po2}bvH1L*8J^KTMG2)5YyVat2w9y(PY-4b
z%a>e99>pz0X&I$kYX`ERC~IZkIY@RCW?x^hQlH*
zwCX2=o?@erMfW@-n?5RNK@^tP#=(&O`T3aE^gd9+$=a^F)j$iasw?KQPpP*-f(OCrUE=yYeYJQ
z#AKL6KHkG{h*3?p^mke@+=ej>8tL_ip~Xfb68hhP#=wB(1zy-hqTBj
zN4?>9a080a+vYOR3k5!t;NqAClawDFq>@D`_f&h#n7+nVN^SLZhla
zq#xwYF|@0mkKV;YT)fuS6xTdfiy{)2jS%rnW{IDLS#_bc-EnJeFvPfWRD4sAA?kXl
zr52iX*k0LLROt{}fAL9j%SP)EGFE?FWa8w@MFh4%0a}jt=Nv5TA{I@k=pG~Zp-f$u
zp2j$@RoF-5N@?vE(JvjB^30`y{{)|J341D1B|;!uqtI>i>l`R99UzKpK<{AQW~@bE
zTK%Ar@sLGZyyA<9|V!!y{c0g$>c38
zo(f)Qd0c$=Azc~a@E|UG2pEg23#YRY!6^QHhl_?|wec%XC*d?i-yMyCO(_}+RgXCuz@6Tbz0y(}*G)!NNe-##1YEu&
zv}ltjAlit#9xS?p-K@b!(SIKParJHM8wj~3MD{TtwiN*zjaW}12oU{HxM8vmx2n=7
zNn8g)Olzbbf`bKp*q9?73gLkqZd~N?fA~ky`l`0afYLRLHp-ClWi234Wg|U%XNScO
z%ISc#mm%t04J0zh}CsqN3C}4UhTR0>v=n1B=w&
z*cWvYkrZMOKR=_Z_mib8Tb^-HXKPua3GiN-W9c@A->J*Av~%OEAZ(dSrBaxCo$nfb
z^7GujHu>lbSutU0aQalpJ~;EyBi@&yM=YYidTB4#q*o$83_1N?GPI7pS9DKq`9DFI
zTB7}4aC-s?$CH{s+;P(74;ZJbxppWgXdgV|@I9(=uAh*WMrJd4mDpQPk7&^AN-~(C
zS+41Ng)KU$8ONib8(ON;!J$*ZrEm*9^Gy%3eu{@J>5*Un-7Uhj>(Z!7Jdzcft9}jv
zagaXf==C-(Spi;ZF^akmVdBv~Tr8R>h+@Z67nlaT1Syj{Utw=3v%ebcr(MB_nDD;l
zYUIi~y-VE4gnjQAVCT-HPVv%ycw9*n`|#T=*$Mq>HFDf17OBtDMYVDC;bHK){T2Yk
z5?P)epLo=0^qN|P0IT8I=}zcc}EuotH7*
zm-V!aQ{A=L`s2pCNa5MmSxFsxRj_NOsA=8twK*73y70qjfOd%<_Cly;EJdmcrmAV?reBABB`z}iT72#*Q3~tI~F&^
z1Lb6RZo?Q_75+2#DGwz&on(qA{`O`p{%R5$cdCoz{6)D*$^q$KlxfDp3`!0}*%=qH
ziL=-KG!v;^%lQ1wmN;7&`xj)J{2u_%ktSkVRb9JrQJ=Bl+Y`c_jg1W*vH=vMn-lA&
z$?ac?^db_yG3S?a>^YwHP;}~Z8h4j3_gr$Z1@>d2#2?-`izrBD$9dxj%r1X({5m?@
z_VljxR`?u4ED4q=EmqxC9PQ}jWPo;T_l+QfJ
zMG<3{O+P7A#?k+afy7y88X_J`MM@8L=I^K~bTM5L4HT{AV3?H>7SBi#zLBScwhs+5
z5k)RJ3atePAbv0CC)V8IHNVJ}C;C0`z#~Xv9>U>z%{O<)?=*hr0`^4d=zY
zd!MLy8C`zN>6+3q+!M&WaI5+nyYw@EMS=S&jobRX#5287V*yvm_EH%f{cF@=37M>G
z3oHM+bxoPqfz1(k@r*`xg!X5Zr*%oY1gB6G3FP%gX<6$ipQLY>>0>~m>slak;v_T^
zel?jC-XKae5}j~$Emy7kLq)TQWM?@2Z}6a3(U_b1fx~^ZN}T4N(Otn<3pAr#g7D&}
z=jbVI-$qCMPlf&NRaPT%Kv)uA$XawUP32Ue9!Y(tscEeF8=9q5hz_EBX0f@2kH&!UD+~-6IuWKq*!BS{7<*BQ_LK7t%~`?h`(2Mg@jU;v$xKj88_LPF
zpe9U2*{vj{o?};^Z;+?+j$l^iL1Tm0Ik*KBR4?j4G))uwDIIiSz+#m4ocHuLybQ8!
z7Yg^a?a8K~PlUE_Qi>VoAVJD>VA)bq=PWUOJ+s=@*S}hs)`Ulj(>|u+$(Pz^z(Ah5;{Lhh9dH)k5+K2duMUu
z8nI)w1Tb49^^dE?SX&Mapm&KW&{&2YrW>t;kbi(lSh3}XO1G_S6M`i!L;KfjX|}vq
z=1zs>ttJ*KMkMXT6fv$tvt|K`FM&rDQol5)Ag@*f_QB#^8LypmWZy9qC1q^)w?nj`
zZLc`cL6Ni4FGY)nH1pPkDOkZl{pfGUvz&lQYlQ9Ky3bo87Ke}ziXwVrZIZPX0>Cpf
z&+;`Y+Xo-xUYcikUFg*L<18TjegeFUl^P`GW>96Kz_gJAN%*emBaoul1g*(|t=FQx$VOVR<`;YU
zCg73i^6LJAFs<=@%ec31145aMf*C!^q^>He8>*>}9$0y8_RTu6tDKlDQSj}+UHDDx
zHQH!d-@@Xp9dCcy2qW#bGm>{vDf8Cct)qd|fNz5Z@qIeB^|R#eWNqdu=f9`t>zy#%
z6_npO)NYe)+kf6)2^6#O4=kQ79~}h!1DsmH^&mEyWA3$;<)7Z2H)c_%DBA*A;obXH
zo_jO73?nt1#@V?yw9dMM2I5DPn#Wo?{4p60_^Q0u_vrD8a;1ZOLHU(_Rd~b@&nuvC
z2&Es=OOp_vmC8bhX#kfxwabPuObsjluBgvJTY@qUZ53vW_CD>
zdD#;NyUcE%f8BYsAK7y*+!;a(1s?50$+g0yP`lwMd&svm!nJlwN{w*Hr-SDw3Rbh`
z#s?qD530GG{7Y0UMDuqex^EodTLJp1r2^kRvlfJwZY|2RNcQ~pE~c@|`ylxj($4p&=)e2uAaV|~?tOdm6PbLnmb|E`}yb3*jwia&7F_ua9bN!E0Q
zxhM~GP(pgCW#N3K@IN$~)hp$%Q8k&kLE^Ee2iUm*!Iw1PeqvOJ^?QHmas<70W7@?k7q=ljaqhF)bS0Gk
zox|_nc)X#>K4J~uP;UOr{{A3P=jGptbq^y#rJga4SCDU%DE>J|D~aA80~ESA{=1OY
z#fdnNtwmCl`cUifO*6=RAj^y!55+ahsodoJ>Di`38a@z!|CkM>Bh-{8FmS_{;_MCm
zCf07o9SdCc<%wZ%SfrSjIV|~P)_%uTq0$`Ak^N>o-kr#wcHh|N`48ow_&)*-LSXaf
zp`D1)e0m~oLTottEvrer*U&!x)vGM+lE3w8PFsaZ0J+{3)4e!5ds=EJJgM|Z4tvSP
zx%kzIot@r*XmE910Vsme#>$Ewa+FEho!m(p3hPZg7=XDdUJ0KJ#8;er-8)?lbez?S
zh-A!#?nW<_xz67Bc6O+8@_0NSeKV%C_SoI`d=PR~i|)u2Lp)Bp*k~kAnGGxosqMH5
z(7l+Nc5|_B4MH|l#zJcX1}}1c#>hV@(x0ppZo6;7neXTb8tra&v{nh)>Cw~|JVnRp
z#Ik2vmdZik`RL5`j+qk9jJzzlq5eH;ui8mpXQ-Bwi*}={x&mr^Vwm2ua&gL
zH=%uL8hxM3j$Oj5B_5z_qhu*Vq-7pDVV3?G-IDwC>|JN<1*q|2t__9?R&}%C{rOj$
z-S6cxC^&pNsbK(yC@KH^mncOuc>o;?PKFllvI-Ixs?MyGfw3yI`K0OT&=^sX_iBcw
zomTk6!sTN?W=ZK24XH^+=?9;mgz?drR|{Q~{AU!z{{ZtHSno>l2E=u6Vq(h7c+mRKE_9Hlnj@KeGN6gToggMsW9vT&zw<&
z8j@#oO;=0NxaSyC7N|obt|LZ$?L1Mo2t@B
zQpZHl;MUz2fgIzKdCv{5B!X}6e9ZV;yR!KVRMw)l&lqeA_lJ&jX7#3(38DP?pvw~Um>o=43
zNNXMVhN$FD;lok&Ls>PR^1JkyP*EI90Wv9RfjS)k4k*(t3b
zTx7C1@10JJfgBZ
ztpQgIOKaH%FZ8|aeba*qrDy~_>uK?tTs)OEF5u`aC0JSVR!r44`Z|`3Qcov^2i%JG
z%{Xl}
zw4=3D+>5h{E%v?5de+qLtmxndz*7NjrIAZ_+a64JxPBR3?O%1SJw};+M}0NN4^}q-
z;k=Rs@?!tUYrMFedpL7tDS4b&-Io6VwU0KK+7X=(jXIf6Ow}+PI83SdVSp|t?tl3Q
zYyZtJRa=id*pOq4iz(``RVhs*AyG{+!I%p6f$bg^fMJE!6&+0HVM5Eao9XkNn5h2k)Pxqfu5^%KO#*`2M0JlcCTSGiwK?M86rZpH2Ph
z2C4Aq$a;>gVOGA()8WAI+k=3Vq4^M~(!6-egAwVwPsx~^R^TyoWhAM3ywPwxuS)pT
zp6Cx*2f=M;{ncE*C0th@W$^{)T_B`omf|$eyOiyY`jXtM?S;!mOrSLp=ik{_>g3^(
z)vL?X0y8DwkhJA8OS!n{H#aFNNnm7fQ%KW&U@~0Nj5Asg5RZqba%%mdxI|g9@)~KY
zXo$^3lZcI!#Gw0jTvYn>CHSnzXD1XHo}uL>3Zw@;vDs
zc~JNPB*(PCSbb=$V#1@gPCqRur@UxP-xQd+Z#wD8iGo7d)3<>;wl0CX>6cV-*a3PrqV6Uc!6GOWGW(J)(BP8F%T)NK
zx?IDw!bF-f>-W+YOSp3TPwQ@%wSAoycF(jyUz;>h=I~R52Y8#*!^@|J(AwC;Z5s~EU`d!3Be$m1Wt
z=S8$Gu-<|{^=clrl4G2`fk!w6S!?mNr5U-)Q??8lZ0rX&+Z9I8vQcAt47sTbd&{KF
zADh9|JSS<;*$*3Cz*yFb89QEscs+yia((S5vk957fG|r${!HsJK0`42jJ`$-@d$
zKDvPz{Me;qpyf}`a!yhvcXT&~cWUu{K$I)|&MiG+nrVJqMG+{ZFZjrUrepEFbDS4W
z$T?e-n5tC*&1lpTp5s?gcq(CRpb60IXg|TRz{?yD?WL-dH2sgzWX;m5>2H69#6wsv
z(Ep=u`EpUDy(KbS_$2bZt1vruoURdj5;69xureIlRSj?MKM-l}RT`oCC0pm|X5Dl2
zfyX`;PdAQKJN!M~dYqr~o-4fu?~5`}tv8%230*K{L+(NtQR|Z!CYFRN8-nRM)KkpOXk5?f9oZR08!=?5M-+BBlMH2)>@rY
zH^hFo-24rOL>y>x1Fj^&jQWMG%a90nvW<=-mmOozANROr|?$En!YMtGFe`v|RB^K66uRviF
zyk-jezPo>1vw_RC?S1~H^P|WGZT`kyjbH0y=+;eF`%1C<1ZkLVd@c=wY}00U(!5DhpFNcOsx6_J*iRdF=Lqo;6IOrt=$sr^
z$hY3Lb_qh)D(!BGN}b~T@oQW~L}8&9Uh$!8=v0>;BlPf{5$0LjXfgU;h`cy9LfObX
z!OSMZpi6#iN0&vjeyu*Ov&P5gx_qX~8xi?$N>?8Q?989NioKWLS<`wB3!axryck!U
z)g>qmWZdc&E`;l9)c<0Z<>wCo(4j&)n*#$f+m7I@R=Q&WZL>oH7ps`^(W*pYlKExw
z*|+8&x>bW3=9)Zz)Qpauym*B|_^7i|aX{6P-*4Wxl!Dt?n;5>W-bLp*I#~Sa%fvjt
z0ucO}CqgRRmTZ`;w0KTYSVb-WV3fuT^CVbQqslsLAw`)y?zMy6D?JI=a+C5N02g%7
zwvhr-8TQXN*OO%n6zzFVYWjmW0e;vOU=Kl4?R9qjEuVaqav~X^$})S=6ah42pjso!
zB14`NOQjwF=>j!ZgYYgJtC>moz??D9DN(8A1*M^Qfs0;0NHYgW1TeQ2MVzf}(aVsm
za3);0T|^advxqg~J7QK&haRSwIq(mnZVdSeQ1phs)x&O#a`dh@)?n{W)
zhTFw3gNZp+&T@4xi8A`ocGz`#iSwbg2#
zYhm)l@1^e~L|5k0Rn@s%OqE-^X%ZVQeu>OFBb@@GKm4jYoOLQE)n;*H{`{!Ird=;R
zuB87`3=JiTr}lI^6Z_jU;mMoeL6yG-?D*3&LhnV>;8WF+@;O4%Z)56Xq!g`KI_rVp
zsBv_UJg5;0uQ@I(f@YMAJ0>&OjzOf$BpSCDt$x0nt72kivSwlf)(?iU&ZX7U`we#5
zVs}s@y9&MpC({-4*U>%TC3w1hNhsWG(9-3_M$^;YPb@wI+fgsQlJ&iTt5>HLf4P4i
zhw&tG$eoywlMme@6_?fwiq-^l^cQuiiKF)DoKw(>A(20rrd~(_SozQZGuJyaopL)n
zsi`8qokpv=`AV~Ei(S$~D(r*2OT7>Vx7QWxP(gXj2DO(wqYazo6Lph+s4h-QWZ(Bz
z#1;4~m$XQYK67RtSG+e|oI%>&Ccs8_&a}(X+`?&XmWfP$wOdB}!V64W7%>LzKR~<_
zB0cS`Lp%x{nu_;zJxBfERrrKB_o<*Y-#)*&kk`&H*ncfQna_37{qZ5Qy#u9Ys3p4wjBLt4|)eOO8=mBFT3;nEwId
zn9!xglRojonVwQY@k4y<;E(ZOPu>kFJoq=Gs%F((TmFrUIaN;S&!!lO50^Zy)Pk^L
zo+BWdsn4*tPKX4!qope4Rx%XjOm_QtVHm6NPT4a`M+V(i`TMGHOka$1$`uicuP~1U
zcJ`kc$TzDQ_UT`1_ir5{pC5W8wDC(0=HfW4>)B1#&X3v^Z99_>HBm`aypuzsf-{yij>h(Pn0Yl(Q*&KStI
zY$}C5l9T@dtV8n!siHmCo$)r2s#V%^f~rV0mjngbjw0WaBDk(J*1aivKkUdycHF88
z2x-}5)$5wnG4NC_;Y)heQ1O;WVx_VBwPxG0Z}!iafka%i-1KThCqXaE?UIDEX`A$u
zI>olG_5Q_T-h5CHZGp;t24^(f6hrqHJ9~;WA9b!18`r`nGadiu?byYrj=m@(79-8Q0j78
zT@;I%rUM^^dC;k*x5ftd8e&LRC)eCCqmd31L5rzRhP*%G9bZYH*7=^GDSUbw_{GBX
z_zMe+TSQnBbwHk_C8Bte;mGTH0qSuQc<{tCH^Ik%K>;vBjs(y=2+j`Dh8;YyNTM@y
z#t#-qr|XhvKS_W{=K*-pI;TFFh@q+fMwR+M`Rt3QK6M)Z04@NBT6dpTDSRJTnCKs|
zC3C%{-AfU|9PBhF~P-waCJ&)I2-q
z;EN}bw5VT}L$Laaem$XlIq_pJa%-Q$
z`Bnag3&3SK-g0pH-Ao19Ta`^F*0eTN>>XFG{#xJjr!t?_O>R>>D$R{A&3w
zF8OFfT_6`Gla{8}AXVMkD@)udlVM;{M5j|?|Klc|wkQ0O5+|};T%yHQ{-g2m)48xS
z1tq3}`{(msYySYmAXT$P!RTr4Z^f`qmEIR$Z`H6DyDgzbL9wH)t1dU?*+g^Hieep}
zoVs-VdlyKZDvqPzW={LB?b3A&E$=k)c6h@R(Uq!smyhU*3nNVcV=H3$*fgv2A9tjNI?Lq{U^b8Nh`>kV>eujJkMna~g-g}xGL$U2Ec33wtfLcrK|SA-rH<3LEw08+&w5vYxY^~PAKIl%uTB$J)Mu>X
zU6u1!Sl6gB7Ikb(v>lkg_EJS=BpWmmg}$pBiXlwyHNbr{i;gLgh~^
ziQ;R?AScBQ6V{S+FBiwk*tmw(FE8F4-=t-VT%$rh&JoQ!CG>l^Q2qS5muLJ#MMv}r
zNs1L+25(iV{{2*E
zwxaXf-v(Ul%FJuklNV17&RM%6eWPCLb=c^YyjLB2#lzYaDBShsk>m|S`*71MV$sz+
zf>~Bg=
za8ro~)ych#^?v|4RdfO;8MFN)n>vxb26v|w>17Tdlwz0
z%p8!ClnlwBV%g4j@e(!nAe~v+f_KTHlkohcAcsLEn8tph$TL)GWF7^nRZ@Mo*o%C0
zer?~6;xCaJHX^@YtsDDq44ibD`}`W;+(qIA#?}FTwc;LJR0wxwc(aGYE-llM6(`=J9RpeOT5{!
z?l}Vt({x~&@2?`v2QL|^1flQyuUEYiAJM72SLG?^%9!TYj3eUTwVMqzTrlx$iJwn+
zdTi)URyOI>>Tqk~yy%$6$E_T0ljwPAN*D87|9zJ6ap+o=t(+vTQw+nh&}$+V5>A5F6E)s&6*eGKT*
z%js}{w`IMZdZu#^8WdE8P0TkO-CEt+IXEs^jJGj`*v&a?BTUS;Lax5QnV--V_&U*E
z$Bip6fgTO6rhm6Xw&?rL3epHR{nG8pHzmRIeavRP@#_d#ENY+Q;_uJ$_&tcO*>90$
zss;k{M7^ZJlEM~+=rJ2|?4r+cBJtSa&`(`XkYzK-FoXX9p9e5`xhQ8B9M7Ea_BpKZ
zSB9p0*Z!<5JkwXxgMFEKr2D?Gh-PB3A}GP@UWO!nJFY{l&)c6HdHTzU%FMOjq+tPQ})I
zLXFK2bYIt)V)M?x}q#17jm5=4Wk@Z*_O+TvW}U!!EK<1LI)pWm*{DfJZ(;
z@b4L4PY4oH>TO=?oASOte-$Cv=-gAiQiz_SW{9PokTj)TRi;WFCG=?9d$5YAUg
zK)9SFep5PW;NXY9!~GEjKUV?4O&NRcM_FY;YYR|KCHFw;B*5hCtXM6`8>R;rixOb3
zFxi`nAi?vyoL{tHNaCg@#17Woh|8v>kuEKdcCQBU>~>qCS-(Y90mo;SIbPp|8*n2%
zS_CecV}8jdmDc@D2!6N1_uTiF(DR{@(%Ras#jzZLxr_OxnsHk%Eeh<7vzNi3CE~2B
zpRbY>#pH%1*3I5#TK8A1E5{4er>8;~Kh{&Qww+$ix*kh&X~|$w=vqQ{l
z{1vtRU-1rnUx;Q!6BIREI2AoKtR6^`AC03mZM
z3>F{x%W}MAlFeNi6umU}C9|gA8u4u5&Fqt-XgofMTZtXhTcELNS~LsEq7lvOL^@0g
zB#rFyy2nrtR@3gN4{nnpf4DoG$UGqzTKLs&W*4EX<;ts|2MW43ko+cgI(I?0V&4&e
zBMI)xA-;GVeQ+w|k`@Khf1|miR)3N#^Jj>z
zPmsxsOhBhl^clYQlSIWciwAGOc%5?Q?_4F3!S>mn&E%ydjgX}o1i+4UE^)|skR<;w
zasTrEqRiK~BpFc@5KbimK^tI|uU+(L27BK%X~&Wf@C@%(pC*@Pi)@5zM!rn!u?Lsk
z(FWX6w}?OMQ+07XXCGcNjrRpkMWXYPFIDA#9`%%$$Mz?#?|{uj6X-W!M)*?vVaj5$
zP^84(^1LK)?gfSb;EZ&xhyzkiyOJ8<)LLbd>TXmc^dimY4ZCLg%ireXjv2pQX5LcY
z>pvflCsiRtOZmzAFe1eFlqv4)v_DOk$mz)Svmf-M92>hXet7>4P;BuF`v*7*IU3~9
zTcjz>VZG)n`1VK~$_@RhIeBK>5IX;^#Cm(g>;*J<7znE^QGsa^B
zGc>XKdSI`HV^Xo=OUEGMohJutsWZV}^aE+HMYSGZTpPnlS0ICxctL!MI~13X#(PNm
zh6>X>LzXk~Al{(Gv7L#gI$f2pI%-R>R0ztwroog$U%(1zeLh}$czIkZ(Ecu&v#F`B
zkI&%GHTj^x2FPX|_HnAJD!#{tq)hZ`;zy;Q(q)l3Y3A%!qJeANQelRiUy05OQqhaK
zY67prGVaY=_QHcdC6(Hgl(!@{;Ua$t&gb?BnQVf6PGvX2%e1f6OPNo8-K9v;+bx>B
z(Z&8uyAp+}pU=B)JpA3_Qr)d+NGeUNv}=)^zv=j@{LpT|Y@&?QoK3D~Rqum#fA{%p
zQ=7GJ2glnec{M^d2PE(_UW!?LA=k#jW0rH1+sa)<{P+__@)G=g+QKKbIcw&JLx#WC
zngfl`e6maT^zey(Fu!XEj5-O`fpQgCu6JzLYwf9sz&Ve;4Bh4l?C8rTDssIGDLLr~
za`PViBs@B0${zPfT%Q|i>Igo_)SIomqY*CF|0_@3oK8|nZS4rE-S#OE{evssH^fa5k9k}
zN@G*eP+kGvj$qsj?ru
zp&2oCtkyZTO29>vLh=*A6YMDmyuGSLQvx+79)Tz0kr#`F#Q0b(Jqs2D(uD+1y<12~TGqd$%S2RPYPOfpuh%W3
z68u+4GLcI5USF}Jej6?YU>pTH7SYI!8V9~^SB=6IHK;DtDF72XX?Ye(NSmqW{sSDN
zwLiA)han|ZSsbUCY!t$CP;(2@M`pL`QIZy#4C%dFZoY;%;!WvFoBS!tS;$pUOi5g
zX87A`(sMH~V1WRju!$%Rr$eM)38`u<^NuEqJ9gn6Vj|;MFqqR*SI!^xOj8heQBaEJ
zW}Yq7q`?gN>{`+70EViQQRTN-iDh$KlkQ9R_K>G%z(~00w43I!ldMj?b{zf;nD9tE
zf5%LMUI_hVIviYAF@$`c=K%mt0wL$<4-1KpL}HHX@mfLqDXB81E~!@KQ-Yv64D##Q
zI8W~=mNb_PuMaLW_6X}NJ{dgU3o-vS@f0d`PS~CO9yhTydnnX<_U+mCBDlc0(XLUp
zp)}qn>fL~s07d+*buxv*rkh?z^5?}TdLig;njlw3a*w>{I$5K0W9;YTG<6Q@ia-mZ
z+sAC#7FKv322$^L_Fp|*K^Nk22n)8mh6cFXqulXefi~JXww8dzQ+J5MYB&t-Iow~=
zCEF&eAXEPb_)+cWp~~$!hR0jJyL>T>E^`szw0Egem)+Tr8e8x?c!eNY8}i%dclA*+
zLE~+rp4eTy2^3~WX@WWWjr-KSm?RC7&;706C~WswO(8iD*K)$Ny8#cUdQWdIn%T>#
zH}j>a{Up{d1%0rsPYe&DsD6UU#^JK~yswb)Quk)Py?6VD)^VQNcKT#Y6&x4rx^teg
zuppkZx<5)xfr%)cKM?QImi6&VwLW%}ul`RTaMS7L5bs{TgNbFkW$rO?Ft%w2OG^}t
zsnfj-ZCXFmB!Bve=>B4(HOEi$Qeplj*Ryw3dnwu^
zmKuCLzCGkaEiP|v^io=bWKNKQqeZ&RaxM{t;pvv)aMYoi@|zh}epmg+{DJA|7ndZ#
zD(HvDpOUKa+Qt*|IFM)?IxKw5HbuNGAlB1s;yaI%!uE*3v08$Z9oJk6LY&rfE*U=6
zeeGL)Re#J1hr`0UDBnto&!2w%K;Cq`3eyNux8Y2%j>k1z{PbHTa3a0%rUW)o95$6M
zI@zX^;B;26q5iDB@QghQpBHhM`e^KfjKGm#ygKUrOw5Mey{t6jmhc&V#atsl_)Z=(
z