修改收付款

src/main/java/com/dk/mdm/mapper/mac/RecPayMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        rp_id, rp_no, rp_type, object_id, org_id, staff_id, sum_amt_rec, sum_amt_pay, sum_should_handle, sum_use_receipt_residue, sum_amt_receivable_handle, sum_amt_payable_handle, sum_waive_amt, acc_date, annex_paths, remarks, biznis_type, biznis_id, biznis_no, flg_lock, make_staff, make_time, flg_valid, cp_id
+        rp_id, rp_no, rp_type, object_id, org_id, staff_id, sum_amt_rec, sum_amt_pay, sum_should_handle, sum_use_receipt_residue, sum_use_payment_residue, sum_amt_receivable_handle, sum_amt_payable_handle, sum_waive_amt, acc_date, annex_paths, remarks, biznis_type, biznis_id, biznis_no, flg_lock, make_staff, make_time, flg_valid, cp_id
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -20,6 +20,7 @@
             <result column="sum_amt_pay" property="sumAmtPay"/>
             <result column="sum_should_handle" property="sumShouldHandle"/>
             <result column="sum_use_receipt_residue" property="sumUseReceiptResidue"/>
+            <result column="sum_use_payment_residue" property="sumUsePaymentResidue"/>
             <result column="sum_amt_receivable_handle" property="sumAmtReceivableHandle"/>
             <result column="sum_amt_payable_handle" property="sumAmtPayableHandle"/>
             <result column="sum_waive_amt" property="sumWaiveAmt"/>
@@ -48,6 +49,7 @@
             <result column="sum_amt_pay" property="sumAmtPay"/>
             <result column="sum_should_handle" property="sumShouldHandle"/>
             <result column="sum_use_receipt_residue" property="sumUseReceiptResidue"/>
+            <result column="sum_use_payment_residue" property="sumUsePaymentResidue"/>
             <result column="sum_amt_receivable_handle" property="sumAmtReceivableHandle"/>
             <result column="sum_amt_payable_handle" property="sumAmtPayableHandle"/>
             <result column="sum_waive_amt" property="sumWaiveAmt"/>
@@ -62,10 +64,10 @@
             <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
             <result column="flg_valid" property="flgValid"/>
             <result column="cp_id" property="cpId"/>
-        <result column="receivable_residue" property="receivableResidue"/>
-        <result column="receipt_residue" property="receiptResidue"/>
-        <result column="payable_residue" property="payableResidue"/>
-        <result column="payment_residue" property="paymentResidue"/>
+            <result column="receivable_residue" property="receivableResidue"/>
+            <result column="receipt_residue" property="receiptResidue"/>
+            <result column="payable_residue" property="payableResidue"/>
+            <result column="payment_residue" property="paymentResidue"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -95,9 +97,12 @@
         <if test="sumShouldHandle != null">
             AND t.sum_should_handle = #{sumShouldHandle}
         </if>
-         <if test="sumUseReceiptResidue != null">
+        <if test="sumUseReceiptResidue != null">
             AND t.sum_use_receipt_residue = #{sumUseReceiptResidue}
         </if>
+        <if test="sumUsePaymentResidue != null">
+            AND t.sum_use_payment_residue = #{sumUsePaymentResidue}
+        </if>
         <if test="sumAmtReceivableHandle != null">
             AND t.sum_amt_receivable_handle = #{sumAmtReceivableHandle}
         </if>
@@ -207,6 +212,7 @@
                t.sum_amt_pay,
                t.sum_should_handle,
                t.sum_use_receipt_residue,
+               t.sum_use_payment_residue,
                t.sum_amt_receivable_handle,
                t.sum_amt_payable_handle,
                t.sum_waive_amt,
@@ -290,6 +296,7 @@
                t.sum_amt_pay,
                t.sum_should_handle,
                t.sum_use_receipt_residue,
+               t.sum_use_payment_residue,
                t.sum_amt_receivable_handle,
                t.sum_amt_payable_handle,
                t.sum_waive_amt,
@@ -366,6 +373,7 @@
             sum_amt_pay,
             sum_should_handle,
             sum_use_receipt_residue,
+            sum_use_payment_residue,
             sum_amt_receivable_handle,
             sum_amt_payable_handle,
             sum_waive_amt,
@@ -395,6 +403,7 @@
                 #{item.sumAmtPay},
                 #{item.sumShouldHandle},
                 #{item.sumUseReceiptResidue},
+                #{item.sumUsePaymentResidue},
                 #{item.sumAmtReceivableHandle},
                 #{item.sumAmtPayableHandle},
                 #{item.sumWaiveAmt},
@@ -432,6 +441,7 @@
                t.sum_amt_pay,
                t.sum_should_handle,
                t.sum_use_receipt_residue,
+               t.sum_use_payment_residue,
                t.sum_amt_receivable_handle,
                t.sum_amt_payable_handle,
                t.sum_waive_amt,

src/main/java/com/dk/mdm/model/pojo/mac/RecPay.java

@@ -118,6 +118,11 @@ public class RecPay extends PageInfo<RecPay> implements Serializable {
     private BigDecimal sumUseReceiptResidue;
 
 
+    @Excel(name = "预付抵扣")
+    @ApiModelProperty(value = "预付抵扣")
+    private BigDecimal sumUsePaymentResidue;
+
+
     @Excel(name = "合计应收冲抵金额")
     @ApiModelProperty(value = "合计应收冲抵金额")
     private BigDecimal sumAmtReceivableHandle;

src/main/java/com/dk/mdm/model/query/mac/RecPayQuery.java

@@ -118,6 +118,11 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
     private BigDecimal sumUseReceiptResidue;
 
 
+    @Excel(name = "预付抵扣")
+    @ApiModelProperty(value = "预付抵扣")
+    private BigDecimal sumUsePaymentResidue;
+
+
     @Excel(name = "合计应收冲抵金额")
     @ApiModelProperty(value = "合计应收冲抵金额")
     private BigDecimal sumAmtReceivableHandle;

src/main/java/com/dk/mdm/model/response/mac/RecPayResponse.java

@@ -120,6 +120,11 @@ public class RecPayResponse extends PageInfo<RecPayResponse> implements Serializ
     private BigDecimal sumUseReceiptResidue;
 
 
+    @Excel(name = "预付抵扣")
+    @ApiModelProperty(value = "预付抵扣")
+    private BigDecimal sumUsePaymentResidue;
+
+
     @Excel(name = "合计应收冲抵金额")
     @ApiModelProperty(value = "合计应收冲抵金额")
     private BigDecimal sumAmtReceivableHandle;

src/main/java/com/dk/mdm/model/vo/ivt/OutboundItemVO.java

@@ -214,7 +214,7 @@ public class OutboundItemVO {
     @ApiModelProperty(value = "库存类型（入库，出库）")
     private String inventoryType;
 
-    @ApiModelProperty(value = "库存业务类型（入库4种，出库4中）")
+    @ApiModelProperty(value = "库存业务类型（入库4种 ，出库4中）")
     private String inventoryDocCode;
 
     @ApiModelProperty(value = "已出库数量编辑之前")
@@ -223,6 +223,8 @@ public class OutboundItemVO {
     @ApiModelProperty(value = "已出库金额编辑之前")
     private BigDecimal amtBeforeUpdate;
 
+    @ApiModelProperty(value = "仓库")
+    private String whId;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/vo/mac/RecPayVO.java

@@ -121,6 +121,11 @@ public class RecPayVO extends PageInfo<RecPayVO> implements Serializable {
     private BigDecimal sumUseReceiptResidue;
 
 
+    @Excel(name = "预付抵扣")
+    @ApiModelProperty(value = "预付抵扣")
+    private BigDecimal sumUsePaymentResidue;
+
+
     @Excel(name = "合计应收冲抵金额")
     @ApiModelProperty(value = "合计应收冲抵金额")
     private BigDecimal sumAmtReceivableHandle;

src/main/java/com/dk/mdm/service/mac/PaymentService.java

@@ -244,9 +244,9 @@ public class PaymentService extends BaseService<RecPay> {
 
             // 更新前的最后校验
             // 剩余应付为负数，则不能保存
-            if (accountUpdate.getPayableResidue().compareTo(BigDecimal.ZERO) == -1) {
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.AMT_HANDLE_NO_LESS_AMT_SHOULD.getMessage());
-            }
+//            if (accountUpdate.getPayableResidue().compareTo(BigDecimal.ZERO) == -1) {
+//                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.AMT_HANDLE_NO_LESS_AMT_SHOULD.getMessage());
+//            }
             // 可用金额为负数，则不能保存
             if (accountUpdate.getPaymentResidue().compareTo(BigDecimal.ZERO) == -1) {
                 throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());

src/main/java/com/dk/mdm/service/mac/ReceiptService.java

@@ -470,9 +470,9 @@ public class ReceiptService extends BaseService<RecPay> {
 
             // 更新前的最后校验
             // 剩余应收为负数，则不能保存
-            if (accountUpdate.getReceivableResidue().compareTo(BigDecimal.ZERO) == -1) {
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.AMT_HANDLE_NO_LESS_AMT_SHOULD.getMessage());
-            }
+//            if (accountUpdate.getReceivableResidue().compareTo(BigDecimal.ZERO) == -1) {
+//                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.AMT_HANDLE_NO_LESS_AMT_SHOULD.getMessage());
+//            }
             // 可用金额为负数，则不能保存
             if (accountUpdate.getReceiptResidue().compareTo(BigDecimal.ZERO) == -1) {
                 throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());