收付款增加预估单价，物流发票扫描自动清除

adm/src/main/java/com/minpay/db/table/mapper/ApOrderPaymentMapper.java

@@ -53,6 +53,14 @@ public interface ApOrderPaymentMapper extends IMINMybatisEntityMapper<ApOrderPay
      *
      * @mbggenerated
      */
+    List<ApOrderPayment> selectByExampleWithBLOBs(ApOrderPaymentExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ap_order_payment
+     *
+     * @mbggenerated
+     */
     List<ApOrderPayment> selectByExample(ApOrderPaymentExample example);
 
     /**
@@ -77,6 +85,14 @@ public interface ApOrderPaymentMapper extends IMINMybatisEntityMapper<ApOrderPay
      *
      * @mbggenerated
      */
+    int updateByExampleWithBLOBs(@Param("record") ApOrderPayment record, @Param("example") ApOrderPaymentExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ap_order_payment
+     *
+     * @mbggenerated
+     */
     int updateByExample(@Param("record") ApOrderPayment record, @Param("example") ApOrderPaymentExample example);
 
     /**
@@ -93,5 +109,13 @@ public interface ApOrderPaymentMapper extends IMINMybatisEntityMapper<ApOrderPay
      *
      * @mbggenerated
      */
+    int updateByPrimaryKeyWithBLOBs(ApOrderPayment record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ap_order_payment
+     *
+     * @mbggenerated
+     */
     int updateByPrimaryKey(ApOrderPayment record);
 }

adm/src/main/java/com/minpay/db/table/model/ApOrderPayment.java

@@ -156,6 +156,102 @@ public class ApOrderPayment extends AbstractMINBean {
     private String termsPayment;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ap_order_payment.AOP_ORIGINAL_AMOUNT
+     *
+     * @mbggenerated
+     */
+    private String originalAmount;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ap_order_payment.AOP_CURRENCY
+     *
+     * @mbggenerated
+     */
+    private String currency;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ap_order_payment.AOP_ESTIMATE_EXCHANGE_RATE
+     *
+     * @mbggenerated
+     */
+    private String estimateExchangeRate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ap_order_payment.AOP_ACTUAL_EXCHANGE_RATE
+     *
+     * @mbggenerated
+     */
+    private String actualExchangeRate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ap_order_payment.AOP_NUMBER
+     *
+     * @mbggenerated
+     */
+    private String number;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ap_order_payment.AOP_APPROVAL_USER
+     *
+     * @mbggenerated
+     */
+    private String approvalUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ap_order_payment.AOP_COUNTTRY_CODE
+     *
+     * @mbggenerated
+     */
+    private String counttryCode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ap_order_payment.AOP_ADDRESS
+     *
+     * @mbggenerated
+     */
+    private String address;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ap_order_payment.AOP_SWIFT_CODE
+     *
+     * @mbggenerated
+     */
+    private String swiftCode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ap_order_payment.AOP_IBAN
+     *
+     * @mbggenerated
+     */
+    private String iban;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ap_order_payment.AOP_PREDICT_PRICE
+     *
+     * @mbggenerated
+     */
+    private String predictPrice;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ap_order_payment.AOP_CONTENT
+     *
+     * @mbggenerated
+     */
+    private String content;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column ap_order_payment.AOP_ID
      *
@@ -610,4 +706,292 @@ public class ApOrderPayment extends AbstractMINBean {
     public void setTermsPayment(String termsPayment) {
         this.termsPayment = termsPayment == null ? null : termsPayment.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ap_order_payment.AOP_ORIGINAL_AMOUNT
+     *
+     * @return the value of ap_order_payment.AOP_ORIGINAL_AMOUNT
+     *
+     * @mbggenerated
+     */
+    public String getOriginalAmount() {
+        return originalAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ap_order_payment.AOP_ORIGINAL_AMOUNT
+     *
+     * @param originalAmount the value for ap_order_payment.AOP_ORIGINAL_AMOUNT
+     *
+     * @mbggenerated
+     */
+    public void setOriginalAmount(String originalAmount) {
+        this.originalAmount = originalAmount == null ? null : originalAmount.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ap_order_payment.AOP_CURRENCY
+     *
+     * @return the value of ap_order_payment.AOP_CURRENCY
+     *
+     * @mbggenerated
+     */
+    public String getCurrency() {
+        return currency;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ap_order_payment.AOP_CURRENCY
+     *
+     * @param currency the value for ap_order_payment.AOP_CURRENCY
+     *
+     * @mbggenerated
+     */
+    public void setCurrency(String currency) {
+        this.currency = currency == null ? null : currency.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ap_order_payment.AOP_ESTIMATE_EXCHANGE_RATE
+     *
+     * @return the value of ap_order_payment.AOP_ESTIMATE_EXCHANGE_RATE
+     *
+     * @mbggenerated
+     */
+    public String getEstimateExchangeRate() {
+        return estimateExchangeRate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ap_order_payment.AOP_ESTIMATE_EXCHANGE_RATE
+     *
+     * @param estimateExchangeRate the value for ap_order_payment.AOP_ESTIMATE_EXCHANGE_RATE
+     *
+     * @mbggenerated
+     */
+    public void setEstimateExchangeRate(String estimateExchangeRate) {
+        this.estimateExchangeRate = estimateExchangeRate == null ? null : estimateExchangeRate.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ap_order_payment.AOP_ACTUAL_EXCHANGE_RATE
+     *
+     * @return the value of ap_order_payment.AOP_ACTUAL_EXCHANGE_RATE
+     *
+     * @mbggenerated
+     */
+    public String getActualExchangeRate() {
+        return actualExchangeRate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ap_order_payment.AOP_ACTUAL_EXCHANGE_RATE
+     *
+     * @param actualExchangeRate the value for ap_order_payment.AOP_ACTUAL_EXCHANGE_RATE
+     *
+     * @mbggenerated
+     */
+    public void setActualExchangeRate(String actualExchangeRate) {
+        this.actualExchangeRate = actualExchangeRate == null ? null : actualExchangeRate.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ap_order_payment.AOP_NUMBER
+     *
+     * @return the value of ap_order_payment.AOP_NUMBER
+     *
+     * @mbggenerated
+     */
+    public String getNumber() {
+        return number;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ap_order_payment.AOP_NUMBER
+     *
+     * @param number the value for ap_order_payment.AOP_NUMBER
+     *
+     * @mbggenerated
+     */
+    public void setNumber(String number) {
+        this.number = number == null ? null : number.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ap_order_payment.AOP_APPROVAL_USER
+     *
+     * @return the value of ap_order_payment.AOP_APPROVAL_USER
+     *
+     * @mbggenerated
+     */
+    public String getApprovalUser() {
+        return approvalUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ap_order_payment.AOP_APPROVAL_USER
+     *
+     * @param approvalUser the value for ap_order_payment.AOP_APPROVAL_USER
+     *
+     * @mbggenerated
+     */
+    public void setApprovalUser(String approvalUser) {
+        this.approvalUser = approvalUser == null ? null : approvalUser.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ap_order_payment.AOP_COUNTTRY_CODE
+     *
+     * @return the value of ap_order_payment.AOP_COUNTTRY_CODE
+     *
+     * @mbggenerated
+     */
+    public String getCounttryCode() {
+        return counttryCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ap_order_payment.AOP_COUNTTRY_CODE
+     *
+     * @param counttryCode the value for ap_order_payment.AOP_COUNTTRY_CODE
+     *
+     * @mbggenerated
+     */
+    public void setCounttryCode(String counttryCode) {
+        this.counttryCode = counttryCode == null ? null : counttryCode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ap_order_payment.AOP_ADDRESS
+     *
+     * @return the value of ap_order_payment.AOP_ADDRESS
+     *
+     * @mbggenerated
+     */
+    public String getAddress() {
+        return address;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ap_order_payment.AOP_ADDRESS
+     *
+     * @param address the value for ap_order_payment.AOP_ADDRESS
+     *
+     * @mbggenerated
+     */
+    public void setAddress(String address) {
+        this.address = address == null ? null : address.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ap_order_payment.AOP_SWIFT_CODE
+     *
+     * @return the value of ap_order_payment.AOP_SWIFT_CODE
+     *
+     * @mbggenerated
+     */
+    public String getSwiftCode() {
+        return swiftCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ap_order_payment.AOP_SWIFT_CODE
+     *
+     * @param swiftCode the value for ap_order_payment.AOP_SWIFT_CODE
+     *
+     * @mbggenerated
+     */
+    public void setSwiftCode(String swiftCode) {
+        this.swiftCode = swiftCode == null ? null : swiftCode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ap_order_payment.AOP_IBAN
+     *
+     * @return the value of ap_order_payment.AOP_IBAN
+     *
+     * @mbggenerated
+     */
+    public String getIban() {
+        return iban;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ap_order_payment.AOP_IBAN
+     *
+     * @param iban the value for ap_order_payment.AOP_IBAN
+     *
+     * @mbggenerated
+     */
+    public void setIban(String iban) {
+        this.iban = iban == null ? null : iban.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ap_order_payment.AOP_PREDICT_PRICE
+     *
+     * @return the value of ap_order_payment.AOP_PREDICT_PRICE
+     *
+     * @mbggenerated
+     */
+    public String getPredictPrice() {
+        return predictPrice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ap_order_payment.AOP_PREDICT_PRICE
+     *
+     * @param predictPrice the value for ap_order_payment.AOP_PREDICT_PRICE
+     *
+     * @mbggenerated
+     */
+    public void setPredictPrice(String predictPrice) {
+        this.predictPrice = predictPrice == null ? null : predictPrice.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ap_order_payment.AOP_CONTENT
+     *
+     * @return the value of ap_order_payment.AOP_CONTENT
+     *
+     * @mbggenerated
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ap_order_payment.AOP_CONTENT
+     *
+     * @param content the value for ap_order_payment.AOP_CONTENT
+     *
+     * @mbggenerated
+     */
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
 }

adm/src/main/java/com/minpay/db/table/model/ApOrderPaymentExample.java

@@ -1671,6 +1671,864 @@ public class ApOrderPaymentExample {
             addCriterion("AOP_TERMS_PAYMENT not between", value1, value2, "termsPayment");
             return (Criteria) this;
         }
+
+        public Criteria andOriginalAmountIsNull() {
+            addCriterion("AOP_ORIGINAL_AMOUNT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalAmountIsNotNull() {
+            addCriterion("AOP_ORIGINAL_AMOUNT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalAmountEqualTo(String value) {
+            if(value == null ){
+                andOriginalAmountIsNull();
+            } else {
+                addCriterion("AOP_ORIGINAL_AMOUNT =", value, "originalAmount");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalAmountNotEqualTo(String value) {
+            if(value == null ){
+                andOriginalAmountIsNotNull();
+            } else {
+                addCriterion("AOP_ORIGINAL_AMOUNT <>", value, "originalAmount");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalAmountGreaterThan(String value) {
+            addCriterion("AOP_ORIGINAL_AMOUNT >", value, "originalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalAmountGreaterThanOrEqualTo(String value) {
+            addCriterion("AOP_ORIGINAL_AMOUNT >=", value, "originalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalAmountLessThan(String value) {
+            addCriterion("AOP_ORIGINAL_AMOUNT <", value, "originalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalAmountLessThanOrEqualTo(String value) {
+            addCriterion("AOP_ORIGINAL_AMOUNT <=", value, "originalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalAmountLike(String value) {
+            addCriterion("AOP_ORIGINAL_AMOUNT like", value, "originalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalAmountNotLike(String value) {
+            addCriterion("AOP_ORIGINAL_AMOUNT not like", value, "originalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalAmountIn(List<String> values) {
+            addCriterion("AOP_ORIGINAL_AMOUNT in", values, "originalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalAmountNotIn(List<String> values) {
+            addCriterion("AOP_ORIGINAL_AMOUNT not in", values, "originalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalAmountBetween(String value1, String value2) {
+            addCriterion("AOP_ORIGINAL_AMOUNT between", value1, value2, "originalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalAmountNotBetween(String value1, String value2) {
+            addCriterion("AOP_ORIGINAL_AMOUNT not between", value1, value2, "originalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyIsNull() {
+            addCriterion("AOP_CURRENCY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyIsNotNull() {
+            addCriterion("AOP_CURRENCY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyEqualTo(String value) {
+            if(value == null ){
+                andCurrencyIsNull();
+            } else {
+                addCriterion("AOP_CURRENCY =", value, "currency");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyNotEqualTo(String value) {
+            if(value == null ){
+                andCurrencyIsNotNull();
+            } else {
+                addCriterion("AOP_CURRENCY <>", value, "currency");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyGreaterThan(String value) {
+            addCriterion("AOP_CURRENCY >", value, "currency");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyGreaterThanOrEqualTo(String value) {
+            addCriterion("AOP_CURRENCY >=", value, "currency");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyLessThan(String value) {
+            addCriterion("AOP_CURRENCY <", value, "currency");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyLessThanOrEqualTo(String value) {
+            addCriterion("AOP_CURRENCY <=", value, "currency");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyLike(String value) {
+            addCriterion("AOP_CURRENCY like", value, "currency");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyNotLike(String value) {
+            addCriterion("AOP_CURRENCY not like", value, "currency");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyIn(List<String> values) {
+            addCriterion("AOP_CURRENCY in", values, "currency");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyNotIn(List<String> values) {
+            addCriterion("AOP_CURRENCY not in", values, "currency");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyBetween(String value1, String value2) {
+            addCriterion("AOP_CURRENCY between", value1, value2, "currency");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrencyNotBetween(String value1, String value2) {
+            addCriterion("AOP_CURRENCY not between", value1, value2, "currency");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateIsNull() {
+            addCriterion("AOP_ESTIMATE_EXCHANGE_RATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateIsNotNull() {
+            addCriterion("AOP_ESTIMATE_EXCHANGE_RATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateEqualTo(String value) {
+            if(value == null ){
+                andEstimateExchangeRateIsNull();
+            } else {
+                addCriterion("AOP_ESTIMATE_EXCHANGE_RATE =", value, "estimateExchangeRate");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateNotEqualTo(String value) {
+            if(value == null ){
+                andEstimateExchangeRateIsNotNull();
+            } else {
+                addCriterion("AOP_ESTIMATE_EXCHANGE_RATE <>", value, "estimateExchangeRate");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateGreaterThan(String value) {
+            addCriterion("AOP_ESTIMATE_EXCHANGE_RATE >", value, "estimateExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateGreaterThanOrEqualTo(String value) {
+            addCriterion("AOP_ESTIMATE_EXCHANGE_RATE >=", value, "estimateExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateLessThan(String value) {
+            addCriterion("AOP_ESTIMATE_EXCHANGE_RATE <", value, "estimateExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateLessThanOrEqualTo(String value) {
+            addCriterion("AOP_ESTIMATE_EXCHANGE_RATE <=", value, "estimateExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateLike(String value) {
+            addCriterion("AOP_ESTIMATE_EXCHANGE_RATE like", value, "estimateExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateNotLike(String value) {
+            addCriterion("AOP_ESTIMATE_EXCHANGE_RATE not like", value, "estimateExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateIn(List<String> values) {
+            addCriterion("AOP_ESTIMATE_EXCHANGE_RATE in", values, "estimateExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateNotIn(List<String> values) {
+            addCriterion("AOP_ESTIMATE_EXCHANGE_RATE not in", values, "estimateExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateBetween(String value1, String value2) {
+            addCriterion("AOP_ESTIMATE_EXCHANGE_RATE between", value1, value2, "estimateExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEstimateExchangeRateNotBetween(String value1, String value2) {
+            addCriterion("AOP_ESTIMATE_EXCHANGE_RATE not between", value1, value2, "estimateExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateIsNull() {
+            addCriterion("AOP_ACTUAL_EXCHANGE_RATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateIsNotNull() {
+            addCriterion("AOP_ACTUAL_EXCHANGE_RATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateEqualTo(String value) {
+            if(value == null ){
+                andActualExchangeRateIsNull();
+            } else {
+                addCriterion("AOP_ACTUAL_EXCHANGE_RATE =", value, "actualExchangeRate");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateNotEqualTo(String value) {
+            if(value == null ){
+                andActualExchangeRateIsNotNull();
+            } else {
+                addCriterion("AOP_ACTUAL_EXCHANGE_RATE <>", value, "actualExchangeRate");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateGreaterThan(String value) {
+            addCriterion("AOP_ACTUAL_EXCHANGE_RATE >", value, "actualExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateGreaterThanOrEqualTo(String value) {
+            addCriterion("AOP_ACTUAL_EXCHANGE_RATE >=", value, "actualExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateLessThan(String value) {
+            addCriterion("AOP_ACTUAL_EXCHANGE_RATE <", value, "actualExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateLessThanOrEqualTo(String value) {
+            addCriterion("AOP_ACTUAL_EXCHANGE_RATE <=", value, "actualExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateLike(String value) {
+            addCriterion("AOP_ACTUAL_EXCHANGE_RATE like", value, "actualExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateNotLike(String value) {
+            addCriterion("AOP_ACTUAL_EXCHANGE_RATE not like", value, "actualExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateIn(List<String> values) {
+            addCriterion("AOP_ACTUAL_EXCHANGE_RATE in", values, "actualExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateNotIn(List<String> values) {
+            addCriterion("AOP_ACTUAL_EXCHANGE_RATE not in", values, "actualExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateBetween(String value1, String value2) {
+            addCriterion("AOP_ACTUAL_EXCHANGE_RATE between", value1, value2, "actualExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andActualExchangeRateNotBetween(String value1, String value2) {
+            addCriterion("AOP_ACTUAL_EXCHANGE_RATE not between", value1, value2, "actualExchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIsNull() {
+            addCriterion("AOP_NUMBER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIsNotNull() {
+            addCriterion("AOP_NUMBER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberEqualTo(String value) {
+            if(value == null ){
+                andNumberIsNull();
+            } else {
+                addCriterion("AOP_NUMBER =", value, "number");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotEqualTo(String value) {
+            if(value == null ){
+                andNumberIsNotNull();
+            } else {
+                addCriterion("AOP_NUMBER <>", value, "number");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberGreaterThan(String value) {
+            addCriterion("AOP_NUMBER >", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("AOP_NUMBER >=", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLessThan(String value) {
+            addCriterion("AOP_NUMBER <", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLessThanOrEqualTo(String value) {
+            addCriterion("AOP_NUMBER <=", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLike(String value) {
+            addCriterion("AOP_NUMBER like", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotLike(String value) {
+            addCriterion("AOP_NUMBER not like", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIn(List<String> values) {
+            addCriterion("AOP_NUMBER in", values, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotIn(List<String> values) {
+            addCriterion("AOP_NUMBER not in", values, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberBetween(String value1, String value2) {
+            addCriterion("AOP_NUMBER between", value1, value2, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotBetween(String value1, String value2) {
+            addCriterion("AOP_NUMBER not between", value1, value2, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserIsNull() {
+            addCriterion("AOP_APPROVAL_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserIsNotNull() {
+            addCriterion("AOP_APPROVAL_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserEqualTo(String value) {
+            if(value == null ){
+                andApprovalUserIsNull();
+            } else {
+                addCriterion("AOP_APPROVAL_USER =", value, "approvalUser");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserNotEqualTo(String value) {
+            if(value == null ){
+                andApprovalUserIsNotNull();
+            } else {
+                addCriterion("AOP_APPROVAL_USER <>", value, "approvalUser");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserGreaterThan(String value) {
+            addCriterion("AOP_APPROVAL_USER >", value, "approvalUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserGreaterThanOrEqualTo(String value) {
+            addCriterion("AOP_APPROVAL_USER >=", value, "approvalUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserLessThan(String value) {
+            addCriterion("AOP_APPROVAL_USER <", value, "approvalUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserLessThanOrEqualTo(String value) {
+            addCriterion("AOP_APPROVAL_USER <=", value, "approvalUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserLike(String value) {
+            addCriterion("AOP_APPROVAL_USER like", value, "approvalUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserNotLike(String value) {
+            addCriterion("AOP_APPROVAL_USER not like", value, "approvalUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserIn(List<String> values) {
+            addCriterion("AOP_APPROVAL_USER in", values, "approvalUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserNotIn(List<String> values) {
+            addCriterion("AOP_APPROVAL_USER not in", values, "approvalUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserBetween(String value1, String value2) {
+            addCriterion("AOP_APPROVAL_USER between", value1, value2, "approvalUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovalUserNotBetween(String value1, String value2) {
+            addCriterion("AOP_APPROVAL_USER not between", value1, value2, "approvalUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeIsNull() {
+            addCriterion("AOP_COUNTTRY_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeIsNotNull() {
+            addCriterion("AOP_COUNTTRY_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeEqualTo(String value) {
+            if(value == null ){
+                andCounttryCodeIsNull();
+            } else {
+                addCriterion("AOP_COUNTTRY_CODE =", value, "counttryCode");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeNotEqualTo(String value) {
+            if(value == null ){
+                andCounttryCodeIsNotNull();
+            } else {
+                addCriterion("AOP_COUNTTRY_CODE <>", value, "counttryCode");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeGreaterThan(String value) {
+            addCriterion("AOP_COUNTTRY_CODE >", value, "counttryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("AOP_COUNTTRY_CODE >=", value, "counttryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeLessThan(String value) {
+            addCriterion("AOP_COUNTTRY_CODE <", value, "counttryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeLessThanOrEqualTo(String value) {
+            addCriterion("AOP_COUNTTRY_CODE <=", value, "counttryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeLike(String value) {
+            addCriterion("AOP_COUNTTRY_CODE like", value, "counttryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeNotLike(String value) {
+            addCriterion("AOP_COUNTTRY_CODE not like", value, "counttryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeIn(List<String> values) {
+            addCriterion("AOP_COUNTTRY_CODE in", values, "counttryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeNotIn(List<String> values) {
+            addCriterion("AOP_COUNTTRY_CODE not in", values, "counttryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeBetween(String value1, String value2) {
+            addCriterion("AOP_COUNTTRY_CODE between", value1, value2, "counttryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCounttryCodeNotBetween(String value1, String value2) {
+            addCriterion("AOP_COUNTTRY_CODE not between", value1, value2, "counttryCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIsNull() {
+            addCriterion("AOP_ADDRESS is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIsNotNull() {
+            addCriterion("AOP_ADDRESS is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressEqualTo(String value) {
+            if(value == null ){
+                andAddressIsNull();
+            } else {
+                addCriterion("AOP_ADDRESS =", value, "address");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotEqualTo(String value) {
+            if(value == null ){
+                andAddressIsNotNull();
+            } else {
+                addCriterion("AOP_ADDRESS <>", value, "address");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressGreaterThan(String value) {
+            addCriterion("AOP_ADDRESS >", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressGreaterThanOrEqualTo(String value) {
+            addCriterion("AOP_ADDRESS >=", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLessThan(String value) {
+            addCriterion("AOP_ADDRESS <", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLessThanOrEqualTo(String value) {
+            addCriterion("AOP_ADDRESS <=", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLike(String value) {
+            addCriterion("AOP_ADDRESS like", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotLike(String value) {
+            addCriterion("AOP_ADDRESS not like", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIn(List<String> values) {
+            addCriterion("AOP_ADDRESS in", values, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotIn(List<String> values) {
+            addCriterion("AOP_ADDRESS not in", values, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressBetween(String value1, String value2) {
+            addCriterion("AOP_ADDRESS between", value1, value2, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotBetween(String value1, String value2) {
+            addCriterion("AOP_ADDRESS not between", value1, value2, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeIsNull() {
+            addCriterion("AOP_SWIFT_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeIsNotNull() {
+            addCriterion("AOP_SWIFT_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeEqualTo(String value) {
+            if(value == null ){
+                andSwiftCodeIsNull();
+            } else {
+                addCriterion("AOP_SWIFT_CODE =", value, "swiftCode");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeNotEqualTo(String value) {
+            if(value == null ){
+                andSwiftCodeIsNotNull();
+            } else {
+                addCriterion("AOP_SWIFT_CODE <>", value, "swiftCode");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeGreaterThan(String value) {
+            addCriterion("AOP_SWIFT_CODE >", value, "swiftCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("AOP_SWIFT_CODE >=", value, "swiftCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeLessThan(String value) {
+            addCriterion("AOP_SWIFT_CODE <", value, "swiftCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeLessThanOrEqualTo(String value) {
+            addCriterion("AOP_SWIFT_CODE <=", value, "swiftCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeLike(String value) {
+            addCriterion("AOP_SWIFT_CODE like", value, "swiftCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeNotLike(String value) {
+            addCriterion("AOP_SWIFT_CODE not like", value, "swiftCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeIn(List<String> values) {
+            addCriterion("AOP_SWIFT_CODE in", values, "swiftCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeNotIn(List<String> values) {
+            addCriterion("AOP_SWIFT_CODE not in", values, "swiftCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeBetween(String value1, String value2) {
+            addCriterion("AOP_SWIFT_CODE between", value1, value2, "swiftCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSwiftCodeNotBetween(String value1, String value2) {
+            addCriterion("AOP_SWIFT_CODE not between", value1, value2, "swiftCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanIsNull() {
+            addCriterion("AOP_IBAN is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanIsNotNull() {
+            addCriterion("AOP_IBAN is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanEqualTo(String value) {
+            if(value == null ){
+                andIbanIsNull();
+            } else {
+                addCriterion("AOP_IBAN =", value, "iban");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanNotEqualTo(String value) {
+            if(value == null ){
+                andIbanIsNotNull();
+            } else {
+                addCriterion("AOP_IBAN <>", value, "iban");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanGreaterThan(String value) {
+            addCriterion("AOP_IBAN >", value, "iban");
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanGreaterThanOrEqualTo(String value) {
+            addCriterion("AOP_IBAN >=", value, "iban");
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanLessThan(String value) {
+            addCriterion("AOP_IBAN <", value, "iban");
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanLessThanOrEqualTo(String value) {
+            addCriterion("AOP_IBAN <=", value, "iban");
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanLike(String value) {
+            addCriterion("AOP_IBAN like", value, "iban");
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanNotLike(String value) {
+            addCriterion("AOP_IBAN not like", value, "iban");
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanIn(List<String> values) {
+            addCriterion("AOP_IBAN in", values, "iban");
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanNotIn(List<String> values) {
+            addCriterion("AOP_IBAN not in", values, "iban");
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanBetween(String value1, String value2) {
+            addCriterion("AOP_IBAN between", value1, value2, "iban");
+            return (Criteria) this;
+        }
+
+        public Criteria andIbanNotBetween(String value1, String value2) {
+            addCriterion("AOP_IBAN not between", value1, value2, "iban");
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceIsNull() {
+            addCriterion("AOP_PREDICT_PRICE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceIsNotNull() {
+            addCriterion("AOP_PREDICT_PRICE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceEqualTo(String value) {
+            if(value == null ){
+                andPredictPriceIsNull();
+            } else {
+                addCriterion("AOP_PREDICT_PRICE =", value, "predictPrice");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceNotEqualTo(String value) {
+            if(value == null ){
+                andPredictPriceIsNotNull();
+            } else {
+                addCriterion("AOP_PREDICT_PRICE <>", value, "predictPrice");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceGreaterThan(String value) {
+            addCriterion("AOP_PREDICT_PRICE >", value, "predictPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceGreaterThanOrEqualTo(String value) {
+            addCriterion("AOP_PREDICT_PRICE >=", value, "predictPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceLessThan(String value) {
+            addCriterion("AOP_PREDICT_PRICE <", value, "predictPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceLessThanOrEqualTo(String value) {
+            addCriterion("AOP_PREDICT_PRICE <=", value, "predictPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceLike(String value) {
+            addCriterion("AOP_PREDICT_PRICE like", value, "predictPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceNotLike(String value) {
+            addCriterion("AOP_PREDICT_PRICE not like", value, "predictPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceIn(List<String> values) {
+            addCriterion("AOP_PREDICT_PRICE in", values, "predictPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceNotIn(List<String> values) {
+            addCriterion("AOP_PREDICT_PRICE not in", values, "predictPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceBetween(String value1, String value2) {
+            addCriterion("AOP_PREDICT_PRICE between", value1, value2, "predictPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andPredictPriceNotBetween(String value1, String value2) {
+            addCriterion("AOP_PREDICT_PRICE not between", value1, value2, "predictPrice");
+            return (Criteria) this;
+        }
     }
 
     /**

adm/src/main/java/com/minpay/guomao/paymentmanage/action/PaymentManageAction.java

@@ -353,7 +353,15 @@ public class PaymentManageAction implements IMINAction {
 		if(!CommonUtil.isEmpty(weight)){
 			ai.setAllWeight(weight);//总重量
 		}
-		
+		//判断重量是否等于0
+		if(CommonUtil.compare(weight,"0") == 0){
+			ai.setPredictPrice("0");
+		}else{
+			//获取预估单价
+			String predictPrice = CommonUtil.divide(totalMoney,weight,2);
+			//预估单价
+			ai.setPredictPrice(predictPrice);
+		}
 		//获取合同信息
 		ApContractInf con = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ApContractInfMapper.class)
 																	.selectByPrimaryKey(contractNo);
@@ -703,6 +711,7 @@ public class PaymentManageAction implements IMINAction {
 			@MINParam(key = "totalMoneys") String totalMoneys,
 			@MINParam(key = "termsPayment") String termsPayment,
 			@MINParam(key = "aopRemarks") String aopRemarks,
+			@MINParam(key = "aopPredictPrice") String aopPredictPrice,
 			MINSession session
 			) throws MINBusinessException {
 		
@@ -722,6 +731,7 @@ public class PaymentManageAction implements IMINAction {
 		p.setYuPrice(totalMoney);			//预估价格
 		p.setTermsPayment(termsPayment);	//付款期限
 		p.setRemarks(aopRemarks); 			//备注
+		p.setPredictPrice(aopPredictPrice); // 预估单价
 		p.setModifyTime(currentTime);		//修改时间
 		p.setModifyUser(u.getId());			//修改人
 		Service.lookup(IMINDataBaseService.class).getMybatisMapper(ApOrderPaymentMapper.class)

adm/src/main/resources/com/minpay/db/table/mapper/ApOrderPaymentMapper.xml

@@ -25,6 +25,24 @@
     <result column="AOP_ALL_WEIGHT" jdbcType="VARCHAR" property="allWeight" />
     <result column="AOP_BRANCH_ID" jdbcType="VARCHAR" property="branchId" />
     <result column="AOP_TERMS_PAYMENT" jdbcType="VARCHAR" property="termsPayment" />
+    <result column="AOP_ORIGINAL_AMOUNT" jdbcType="VARCHAR" property="originalAmount" />
+    <result column="AOP_CURRENCY" jdbcType="VARCHAR" property="currency" />
+    <result column="AOP_ESTIMATE_EXCHANGE_RATE" jdbcType="VARCHAR" property="estimateExchangeRate" />
+    <result column="AOP_ACTUAL_EXCHANGE_RATE" jdbcType="VARCHAR" property="actualExchangeRate" />
+    <result column="AOP_NUMBER" jdbcType="VARCHAR" property="number" />
+    <result column="AOP_APPROVAL_USER" jdbcType="VARCHAR" property="approvalUser" />
+    <result column="AOP_COUNTTRY_CODE" jdbcType="VARCHAR" property="counttryCode" />
+    <result column="AOP_ADDRESS" jdbcType="VARCHAR" property="address" />
+    <result column="AOP_SWIFT_CODE" jdbcType="VARCHAR" property="swiftCode" />
+    <result column="AOP_IBAN" jdbcType="VARCHAR" property="iban" />
+    <result column="AOP_PREDICT_PRICE" jdbcType="VARCHAR" property="predictPrice" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.minpay.db.table.model.ApOrderPayment">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <result column="AOP_CONTENT" jdbcType="LONGVARCHAR" property="content" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -100,8 +118,37 @@
     AOP_ID, AOP_TYPE, AOP_PRICE_TYPE, AOP_PAY_TYPE, AOP_COMPANY_ID, AOP_CONTRACT_ID, 
     AOP_ORDER_ID, AOP_ACCOUNT_ID, AOP_PAY_PRICE, AOP_REMARKS, AOP_CREATE_USER, AOP_CREATE_TIME, 
     AOP_MODIFY_USER, AOP_MODIFY_TIME, AOP_STATE, AOP_YU_PRICE, AOP_ALL_WEIGHT, AOP_BRANCH_ID, 
-    AOP_TERMS_PAYMENT
+    AOP_TERMS_PAYMENT, AOP_ORIGINAL_AMOUNT, AOP_CURRENCY, AOP_ESTIMATE_EXCHANGE_RATE, 
+    AOP_ACTUAL_EXCHANGE_RATE, AOP_NUMBER, AOP_APPROVAL_USER, AOP_COUNTTRY_CODE, AOP_ADDRESS, 
+    AOP_SWIFT_CODE, AOP_IBAN, AOP_PREDICT_PRICE
+  </sql>
+  <sql id="Blob_Column_List">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    AOP_CONTENT
   </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.minpay.db.table.model.ApOrderPaymentExample" resultMap="ResultMapWithBLOBs">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from ap_order_payment
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by $orderByClause$
+    </if>
+  </select>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.ApOrderPaymentExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
@@ -120,13 +167,15 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select 
     <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from ap_order_payment
     where AOP_ID = #{id,jdbcType=VARCHAR}
   </select>
@@ -159,14 +208,22 @@
       AOP_REMARKS, AOP_CREATE_USER, AOP_CREATE_TIME, 
       AOP_MODIFY_USER, AOP_MODIFY_TIME, AOP_STATE, 
       AOP_YU_PRICE, AOP_ALL_WEIGHT, AOP_BRANCH_ID, 
-      AOP_TERMS_PAYMENT)
+      AOP_TERMS_PAYMENT, AOP_ORIGINAL_AMOUNT, AOP_CURRENCY, 
+      AOP_ESTIMATE_EXCHANGE_RATE, AOP_ACTUAL_EXCHANGE_RATE, 
+      AOP_NUMBER, AOP_APPROVAL_USER, AOP_COUNTTRY_CODE, 
+      AOP_ADDRESS, AOP_SWIFT_CODE, AOP_IBAN, 
+      AOP_PREDICT_PRICE, AOP_CONTENT)
     values (#{id,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{priceType,jdbcType=VARCHAR}, 
       #{payType,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, 
       #{orderId,jdbcType=VARCHAR}, #{accountId,jdbcType=VARCHAR}, #{payPrice,jdbcType=VARCHAR}, 
       #{remarks,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, 
       #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, 
       #{yuPrice,jdbcType=VARCHAR}, #{allWeight,jdbcType=VARCHAR}, #{branchId,jdbcType=VARCHAR}, 
-      #{termsPayment,jdbcType=VARCHAR})
+      #{termsPayment,jdbcType=VARCHAR}, #{originalAmount,jdbcType=VARCHAR}, #{currency,jdbcType=VARCHAR}, 
+      #{estimateExchangeRate,jdbcType=VARCHAR}, #{actualExchangeRate,jdbcType=VARCHAR}, 
+      #{number,jdbcType=VARCHAR}, #{approvalUser,jdbcType=VARCHAR}, #{counttryCode,jdbcType=VARCHAR}, 
+      #{address,jdbcType=VARCHAR}, #{swiftCode,jdbcType=VARCHAR}, #{iban,jdbcType=VARCHAR}, 
+      #{predictPrice,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.ApOrderPayment">
     <!--
@@ -232,6 +289,42 @@
       <if test="termsPayment != null">
         AOP_TERMS_PAYMENT,
       </if>
+      <if test="originalAmount != null">
+        AOP_ORIGINAL_AMOUNT,
+      </if>
+      <if test="currency != null">
+        AOP_CURRENCY,
+      </if>
+      <if test="estimateExchangeRate != null">
+        AOP_ESTIMATE_EXCHANGE_RATE,
+      </if>
+      <if test="actualExchangeRate != null">
+        AOP_ACTUAL_EXCHANGE_RATE,
+      </if>
+      <if test="number != null">
+        AOP_NUMBER,
+      </if>
+      <if test="approvalUser != null">
+        AOP_APPROVAL_USER,
+      </if>
+      <if test="counttryCode != null">
+        AOP_COUNTTRY_CODE,
+      </if>
+      <if test="address != null">
+        AOP_ADDRESS,
+      </if>
+      <if test="swiftCode != null">
+        AOP_SWIFT_CODE,
+      </if>
+      <if test="iban != null">
+        AOP_IBAN,
+      </if>
+      <if test="predictPrice != null">
+        AOP_PREDICT_PRICE,
+      </if>
+      <if test="content != null">
+        AOP_CONTENT,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -291,6 +384,42 @@
       <if test="termsPayment != null">
         #{termsPayment,jdbcType=VARCHAR},
       </if>
+      <if test="originalAmount != null">
+        #{originalAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="currency != null">
+        #{currency,jdbcType=VARCHAR},
+      </if>
+      <if test="estimateExchangeRate != null">
+        #{estimateExchangeRate,jdbcType=VARCHAR},
+      </if>
+      <if test="actualExchangeRate != null">
+        #{actualExchangeRate,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null">
+        #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUser != null">
+        #{approvalUser,jdbcType=VARCHAR},
+      </if>
+      <if test="counttryCode != null">
+        #{counttryCode,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="swiftCode != null">
+        #{swiftCode,jdbcType=VARCHAR},
+      </if>
+      <if test="iban != null">
+        #{iban,jdbcType=VARCHAR},
+      </if>
+      <if test="predictPrice != null">
+        #{predictPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="content != null">
+        #{content,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.ApOrderPaymentExample" resultType="java.lang.Integer">
@@ -367,11 +496,88 @@
       <if test="record.termsPayment != null">
         AOP_TERMS_PAYMENT = #{record.termsPayment,jdbcType=VARCHAR},
       </if>
+      <if test="record.originalAmount != null">
+        AOP_ORIGINAL_AMOUNT = #{record.originalAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.currency != null">
+        AOP_CURRENCY = #{record.currency,jdbcType=VARCHAR},
+      </if>
+      <if test="record.estimateExchangeRate != null">
+        AOP_ESTIMATE_EXCHANGE_RATE = #{record.estimateExchangeRate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.actualExchangeRate != null">
+        AOP_ACTUAL_EXCHANGE_RATE = #{record.actualExchangeRate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.number != null">
+        AOP_NUMBER = #{record.number,jdbcType=VARCHAR},
+      </if>
+      <if test="record.approvalUser != null">
+        AOP_APPROVAL_USER = #{record.approvalUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.counttryCode != null">
+        AOP_COUNTTRY_CODE = #{record.counttryCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.address != null">
+        AOP_ADDRESS = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.swiftCode != null">
+        AOP_SWIFT_CODE = #{record.swiftCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.iban != null">
+        AOP_IBAN = #{record.iban,jdbcType=VARCHAR},
+      </if>
+      <if test="record.predictPrice != null">
+        AOP_PREDICT_PRICE = #{record.predictPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.content != null">
+        AOP_CONTENT = #{record.content,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update ap_order_payment
+    set AOP_ID = #{record.id,jdbcType=VARCHAR},
+      AOP_TYPE = #{record.type,jdbcType=VARCHAR},
+      AOP_PRICE_TYPE = #{record.priceType,jdbcType=VARCHAR},
+      AOP_PAY_TYPE = #{record.payType,jdbcType=VARCHAR},
+      AOP_COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      AOP_CONTRACT_ID = #{record.contractId,jdbcType=VARCHAR},
+      AOP_ORDER_ID = #{record.orderId,jdbcType=VARCHAR},
+      AOP_ACCOUNT_ID = #{record.accountId,jdbcType=VARCHAR},
+      AOP_PAY_PRICE = #{record.payPrice,jdbcType=VARCHAR},
+      AOP_REMARKS = #{record.remarks,jdbcType=VARCHAR},
+      AOP_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      AOP_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      AOP_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
+      AOP_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
+      AOP_STATE = #{record.state,jdbcType=VARCHAR},
+      AOP_YU_PRICE = #{record.yuPrice,jdbcType=VARCHAR},
+      AOP_ALL_WEIGHT = #{record.allWeight,jdbcType=VARCHAR},
+      AOP_BRANCH_ID = #{record.branchId,jdbcType=VARCHAR},
+      AOP_TERMS_PAYMENT = #{record.termsPayment,jdbcType=VARCHAR},
+      AOP_ORIGINAL_AMOUNT = #{record.originalAmount,jdbcType=VARCHAR},
+      AOP_CURRENCY = #{record.currency,jdbcType=VARCHAR},
+      AOP_ESTIMATE_EXCHANGE_RATE = #{record.estimateExchangeRate,jdbcType=VARCHAR},
+      AOP_ACTUAL_EXCHANGE_RATE = #{record.actualExchangeRate,jdbcType=VARCHAR},
+      AOP_NUMBER = #{record.number,jdbcType=VARCHAR},
+      AOP_APPROVAL_USER = #{record.approvalUser,jdbcType=VARCHAR},
+      AOP_COUNTTRY_CODE = #{record.counttryCode,jdbcType=VARCHAR},
+      AOP_ADDRESS = #{record.address,jdbcType=VARCHAR},
+      AOP_SWIFT_CODE = #{record.swiftCode,jdbcType=VARCHAR},
+      AOP_IBAN = #{record.iban,jdbcType=VARCHAR},
+      AOP_PREDICT_PRICE = #{record.predictPrice,jdbcType=VARCHAR},
+      AOP_CONTENT = #{record.content,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
   <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbggenerated
@@ -396,7 +602,18 @@
       AOP_YU_PRICE = #{record.yuPrice,jdbcType=VARCHAR},
       AOP_ALL_WEIGHT = #{record.allWeight,jdbcType=VARCHAR},
       AOP_BRANCH_ID = #{record.branchId,jdbcType=VARCHAR},
-      AOP_TERMS_PAYMENT = #{record.termsPayment,jdbcType=VARCHAR}
+      AOP_TERMS_PAYMENT = #{record.termsPayment,jdbcType=VARCHAR},
+      AOP_ORIGINAL_AMOUNT = #{record.originalAmount,jdbcType=VARCHAR},
+      AOP_CURRENCY = #{record.currency,jdbcType=VARCHAR},
+      AOP_ESTIMATE_EXCHANGE_RATE = #{record.estimateExchangeRate,jdbcType=VARCHAR},
+      AOP_ACTUAL_EXCHANGE_RATE = #{record.actualExchangeRate,jdbcType=VARCHAR},
+      AOP_NUMBER = #{record.number,jdbcType=VARCHAR},
+      AOP_APPROVAL_USER = #{record.approvalUser,jdbcType=VARCHAR},
+      AOP_COUNTTRY_CODE = #{record.counttryCode,jdbcType=VARCHAR},
+      AOP_ADDRESS = #{record.address,jdbcType=VARCHAR},
+      AOP_SWIFT_CODE = #{record.swiftCode,jdbcType=VARCHAR},
+      AOP_IBAN = #{record.iban,jdbcType=VARCHAR},
+      AOP_PREDICT_PRICE = #{record.predictPrice,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -462,9 +679,83 @@
       <if test="termsPayment != null">
         AOP_TERMS_PAYMENT = #{termsPayment,jdbcType=VARCHAR},
       </if>
+      <if test="originalAmount != null">
+        AOP_ORIGINAL_AMOUNT = #{originalAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="currency != null">
+        AOP_CURRENCY = #{currency,jdbcType=VARCHAR},
+      </if>
+      <if test="estimateExchangeRate != null">
+        AOP_ESTIMATE_EXCHANGE_RATE = #{estimateExchangeRate,jdbcType=VARCHAR},
+      </if>
+      <if test="actualExchangeRate != null">
+        AOP_ACTUAL_EXCHANGE_RATE = #{actualExchangeRate,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null">
+        AOP_NUMBER = #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalUser != null">
+        AOP_APPROVAL_USER = #{approvalUser,jdbcType=VARCHAR},
+      </if>
+      <if test="counttryCode != null">
+        AOP_COUNTTRY_CODE = #{counttryCode,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        AOP_ADDRESS = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="swiftCode != null">
+        AOP_SWIFT_CODE = #{swiftCode,jdbcType=VARCHAR},
+      </if>
+      <if test="iban != null">
+        AOP_IBAN = #{iban,jdbcType=VARCHAR},
+      </if>
+      <if test="predictPrice != null">
+        AOP_PREDICT_PRICE = #{predictPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="content != null">
+        AOP_CONTENT = #{content,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where AOP_ID = #{id,jdbcType=VARCHAR}
   </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.minpay.db.table.model.ApOrderPayment">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update ap_order_payment
+    set AOP_TYPE = #{type,jdbcType=VARCHAR},
+      AOP_PRICE_TYPE = #{priceType,jdbcType=VARCHAR},
+      AOP_PAY_TYPE = #{payType,jdbcType=VARCHAR},
+      AOP_COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      AOP_CONTRACT_ID = #{contractId,jdbcType=VARCHAR},
+      AOP_ORDER_ID = #{orderId,jdbcType=VARCHAR},
+      AOP_ACCOUNT_ID = #{accountId,jdbcType=VARCHAR},
+      AOP_PAY_PRICE = #{payPrice,jdbcType=VARCHAR},
+      AOP_REMARKS = #{remarks,jdbcType=VARCHAR},
+      AOP_CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      AOP_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      AOP_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
+      AOP_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
+      AOP_STATE = #{state,jdbcType=VARCHAR},
+      AOP_YU_PRICE = #{yuPrice,jdbcType=VARCHAR},
+      AOP_ALL_WEIGHT = #{allWeight,jdbcType=VARCHAR},
+      AOP_BRANCH_ID = #{branchId,jdbcType=VARCHAR},
+      AOP_TERMS_PAYMENT = #{termsPayment,jdbcType=VARCHAR},
+      AOP_ORIGINAL_AMOUNT = #{originalAmount,jdbcType=VARCHAR},
+      AOP_CURRENCY = #{currency,jdbcType=VARCHAR},
+      AOP_ESTIMATE_EXCHANGE_RATE = #{estimateExchangeRate,jdbcType=VARCHAR},
+      AOP_ACTUAL_EXCHANGE_RATE = #{actualExchangeRate,jdbcType=VARCHAR},
+      AOP_NUMBER = #{number,jdbcType=VARCHAR},
+      AOP_APPROVAL_USER = #{approvalUser,jdbcType=VARCHAR},
+      AOP_COUNTTRY_CODE = #{counttryCode,jdbcType=VARCHAR},
+      AOP_ADDRESS = #{address,jdbcType=VARCHAR},
+      AOP_SWIFT_CODE = #{swiftCode,jdbcType=VARCHAR},
+      AOP_IBAN = #{iban,jdbcType=VARCHAR},
+      AOP_PREDICT_PRICE = #{predictPrice,jdbcType=VARCHAR},
+      AOP_CONTENT = #{content,jdbcType=LONGVARCHAR}
+    where AOP_ID = #{id,jdbcType=VARCHAR}
+  </update>
   <update id="updateByPrimaryKey" parameterType="com.minpay.db.table.model.ApOrderPayment">
     <!--
       WARNING - @mbggenerated
@@ -488,7 +779,18 @@
       AOP_YU_PRICE = #{yuPrice,jdbcType=VARCHAR},
       AOP_ALL_WEIGHT = #{allWeight,jdbcType=VARCHAR},
       AOP_BRANCH_ID = #{branchId,jdbcType=VARCHAR},
-      AOP_TERMS_PAYMENT = #{termsPayment,jdbcType=VARCHAR}
+      AOP_TERMS_PAYMENT = #{termsPayment,jdbcType=VARCHAR},
+      AOP_ORIGINAL_AMOUNT = #{originalAmount,jdbcType=VARCHAR},
+      AOP_CURRENCY = #{currency,jdbcType=VARCHAR},
+      AOP_ESTIMATE_EXCHANGE_RATE = #{estimateExchangeRate,jdbcType=VARCHAR},
+      AOP_ACTUAL_EXCHANGE_RATE = #{actualExchangeRate,jdbcType=VARCHAR},
+      AOP_NUMBER = #{number,jdbcType=VARCHAR},
+      AOP_APPROVAL_USER = #{approvalUser,jdbcType=VARCHAR},
+      AOP_COUNTTRY_CODE = #{counttryCode,jdbcType=VARCHAR},
+      AOP_ADDRESS = #{address,jdbcType=VARCHAR},
+      AOP_SWIFT_CODE = #{swiftCode,jdbcType=VARCHAR},
+      AOP_IBAN = #{iban,jdbcType=VARCHAR},
+      AOP_PREDICT_PRICE = #{predictPrice,jdbcType=VARCHAR}
     where AOP_ID = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

adm/src/main/resources/com/minpay/db/table/own/mapper/PaymentManageMapper.xml

@@ -139,8 +139,8 @@
 		f.ACI_SHORT_NAME 			"seller",
 		a.AOP_STATE					"state",
 		a.AOP_CREATE_TIME			"createTime",
-		IFNULL(a.AOP_PAY_PRICE,0)             "totalMoneys",
-		IFNULL(a.AOP_YU_PRICE,0)				"totalMoney",
+		IFNULL(a.AOP_PAY_PRICE,'0.00')             "totalMoneys",
+		IFNULL(a.AOP_YU_PRICE,'0.00')				"totalMoney",
 		a.AOP_ID            		"id",
 		IFNULL(t.ACA_BANK_NUMBER,'未维护')			"bankNum",
 		IFNULL(t.ACA_BANK_NAME,'未维护')				"bankName",
@@ -148,7 +148,8 @@
 		p.ADP_ID			"adpId",
 		IFNULL(a.AOP_TERMS_PAYMENT,'')	"termsPayment",
 		a.AOP_ALL_WEIGHT			'aopAllWeight',
-		a.AOP_REMARKS				'aopRemarks'
+		a.AOP_REMARKS				'aopRemarks',
+		IFNULL(a.AOP_PREDICT_PRICE,'0.00')'aopPredictPrice'
 		FROM ap_order_payment a
 			LEFT JOIN ap_contract_inf e
 				ON a.AOP_CONTRACT_ID = e.ACI_ID

adm/src/main/webapp/admin/logisticsManage/addLogisticInvoice.html

@@ -253,6 +253,8 @@
 			success : function(data) {
 				// 设定基础数据
 				initFpInf(data.fpInf, data.fpList, null, true);
+				$("#barcode").val('');
+				$("#barcode").focus();
 			},
 			error : function(data2) {
 				layer.alert(data2.MINErrorMessage, {

adm/src/main/webapp/admin/paymentManage/paymentManage.html

@@ -153,6 +153,7 @@
 		      ,{field: 'termsPayment', title: '付款期限',width:"10%",style:'background-color: #C1FFC1; color: #333;'}
 		      ,{field: 'aopAllWeight', title: '重量', width:"13%", } 
 		      ,{field: 'totalMoney', title: '预估收付款金额', width:"15%",edit: 'text',style:'background-color: #C1FFC1; color: #333;'}
+		      ,{field: 'aopPredictPrice', title: '预估单价', width:"15%",edit: 'text',style:'background-color: #C1FFC1; color: #333;'}
 		      ,{field: 'totalMoneys', title: '实际收付款金额', width:"15%",edit: 'text',style:'background-color: #C1FFC1; color: #333;'}
 		      ,{field: 'aopRemarks', title: '备注', width:"13%",edit: 'text',style:'background-color: #C1FFC1; color: #333;'}
 		      ,{field: 'typeDesc', title: '收付类型', width:"10%", }
@@ -257,7 +258,8 @@
 							totalMoney : data.totalMoney,
 							totalMoneys : data.totalMoneys,
 							termsPayment : data.termsPayment,
-							aopRemarks:data.aopRemarks
+							aopRemarks:data.aopRemarks,
+							aopPredictPrice:data.aopPredictPrice
 						},
 
 						success : function(resData) {