1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PaymentManagementController.java

@@ -96,6 +96,14 @@ public class PaymentManagementController {
     public String generateOrder(@RequestBody PaymentManagement paymentManagement){
         return paymentManagementService.generateOrder(paymentManagement);
     }
+    /**
+     * 上传自产证明
+     */
+    @PostMapping("/uploadSelfCertificate")
+    public String uploadSelfCertificate(@RequestBody PaymentManagement paymentManagement) {
+        return paymentManagementService.uploadSelfCertificate(paymentManagement);
+    }
+
     /**
      * 编辑应收
      * @param paymentManagement

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PaymentManagement.java

@@ -281,6 +281,16 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 付款员
      */
     private String cashier;
+    /**
+     * 总账付款日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date accountPaymentDate;
+    /**
+     * 付款凭证编号
+     */
+    private String paymentVoucherNumber;
     /**
      * 自产证明
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehousingOrder.java

@@ -437,6 +437,16 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
      * 开户支行
      */
     private String bankDepositBranch;
+    /**
+     * 总账付款日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date accountPaymentDate;
+    /**
+     * 付款凭证编号
+     */
+    private String paymentVoucherNumber;
     /**
      * 净重（吨）
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IPaymentManagementService.java

@@ -123,4 +123,6 @@ public interface IPaymentManagementService extends IService<PaymentManagement> {
      * @throws Exception
      */
     PaymentView exportPhoneData(PaymentManagement paymentManagement);
+
+    String uploadSelfCertificate(PaymentManagement paymentManagement);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -2821,6 +2821,12 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
 
     }
 
+    @Override
+    public String uploadSelfCertificate(PaymentManagement paymentManagement) {
+        this.updateById(paymentManagement);
+        return "OK";
+    }
+
 
     /**
      * 入库单手机审核文件下载

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -1566,6 +1566,8 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     warehousingOrder1.setAmountNotPayable(warehousingOrder1.getAmountNotPayable() - warehousingOrder1.getRequestFunds());
                     warehousingOrder1.setAmountEdPayable(warehousingOrder1.getAmountEdPayable() + warehousingOrder1.getRequestFunds());
                     warehousingOrder1.setRequestFunds(0d);
+                    warehousingOrder1.setAccountPaymentDate(warehousingOrder.getAccountPaymentDate());
+                    warehousingOrder1.setPaymentVoucherNumber(warehousingOrder.getPaymentVoucherNumber());
                     warehousingOrder1.setStatusFlag("");
                     warehousingOrder1.setStatus("");
                     this.updateById(warehousingOrder1);
@@ -1583,6 +1585,8 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                                     paymentManagement.setStatus("部分付款");
                                     paymentManagement.setStatusFlag("4");
                                 }
+                                paymentManagement.setAccountPaymentDate(warehousingOrder.getAccountPaymentDate());
+                                paymentManagement.setPaymentVoucherNumber(warehousingOrder.getPaymentVoucherNumber());
                                 paymentManagementService.updateById(paymentManagement);
                             }
                         }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -152,6 +152,8 @@
         a.update_date as updateDate,
         a.reverse_flag as reverseFlag,
         a.workflow_id as workflowId,
+        a.account_payment_date as accountPaymentDate,
+        a.payment_voucher_number as paymentVoucherNumber,
         a.create_date as createDate,
         a.unit_deduction as unitDeduction,
         q.picture_address as qualityInspectionPictureAddress,