出纳付款，开发票

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

@@ -1,9 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseReceiptReport;
+import com.yh.saas.plugin.yiliangyiyun.service.IPurchaseReceiptReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -17,5 +19,64 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/purchaseReceiptReport")
 public class PurchaseReceiptReportController {
 
+    @Autowired
+    private IPurchaseReceiptReportService purchaseReceiptReportService;
+    /**
+     * 采购入库统计列表
+     * @param purchaseReceiptReport
+     * @return
+     */
+    @GetMapping("/selectPurchaseOrder")
+    public Page<PurchaseReceiptReport> selectPurchaseOrder(PurchaseReceiptReport purchaseReceiptReport){
+        return purchaseReceiptReportService.selectPurchaseOrder(purchaseReceiptReport);
+    }
+    /**
+     * 编辑采购入库统计
+     * @param purchaseReceiptReport
+     * @return
+     */
+    @PostMapping("/api/editProcurementReceiptReport")
+    public String editProcurementReceiptReport(@RequestBody PurchaseReceiptReport purchaseReceiptReport){
+        return purchaseReceiptReportService.editProcurementReceiptReport(purchaseReceiptReport);
+    }
+
+    /**
+     * 补货结转
+     * @param purchaseReceiptReport
+     * @return
+     */
+    @PostMapping("/api/replenishment")
+    public String replenishment(@RequestBody PurchaseReceiptReport purchaseReceiptReport){
+        return purchaseReceiptReportService.replenishment(purchaseReceiptReport);
+    }
+
+    /**
+     * 出纳付款
+     * @param purchaseReceiptReport
+     * @return
+     */
+    @PostMapping("/api/payMoney")
+    public String payMoney(@RequestBody PurchaseReceiptReport purchaseReceiptReport){
+        return purchaseReceiptReportService.payMoney(purchaseReceiptReport);
+    }
+    /**
+     * 开发票
+     * @param purchaseReceiptReport
+     * @return
+     */
+    @PostMapping("/api/openInvoice")
+    public String openInvoice(@RequestBody PurchaseReceiptReport purchaseReceiptReport) {
+        return purchaseReceiptReportService.openInvoice(purchaseReceiptReport);
+    }
+    /**
+     * 批量开发票
+     * @param purchaseReceiptReport
+     * @return
+     */
+    @PostMapping("/api/openInvoiceList")
+    public String openInvoiceList(@RequestBody PurchaseReceiptReport purchaseReceiptReport) {
+        return purchaseReceiptReportService.openInvoiceList(purchaseReceiptReport);
+    }
+
 }
 

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

@@ -3,6 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 import java.util.Date;
 import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -205,6 +206,11 @@ public class PurchaseReceiptReport extends BaseModel<PurchaseReceiptReport> {
      */
     @TableField(exist = false)
     private String searchType;
+    /**
+     *付款金额
+     */
+    @TableField(exist = false)
+    private Float money;
 
 
     /**
@@ -212,6 +218,8 @@ public class PurchaseReceiptReport extends BaseModel<PurchaseReceiptReport> {
      */
     @TableField(exist = false)
     private PurchaseReceiptReport purchaseReceiptReport;
+    @TableField(exist = false)
+    private List<PurchaseReceiptReport> purchaseReceiptReportList;
 
 
     @Override

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

@@ -14,12 +14,37 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface IPurchaseReceiptReportService extends IService<PurchaseReceiptReport> {
 
-
+    /**
+     * 采购入库统计列表
+     * @param purchaseReceiptReport
+     */
     Page<PurchaseReceiptReport> selectPurchaseOrder(PurchaseReceiptReport purchaseReceiptReport);
 
-
+    /**
+     * 编辑采购入库统计
+     * @param purchaseReceiptReport
+     */
     String editProcurementReceiptReport(PurchaseReceiptReport purchaseReceiptReport);
 
-
+    /**
+     * 补货结转
+     * @param purchaseReceiptReport
+     */
     String replenishment(PurchaseReceiptReport purchaseReceiptReport);
+    /**
+     * 出纳付款
+     * @param purchaseReceiptReport
+     */
+    String payMoney(PurchaseReceiptReport purchaseReceiptReport);
+    /**
+     * 开发票
+     * @param purchaseReceiptReport
+     * @return
+     */
+    String openInvoice(PurchaseReceiptReport purchaseReceiptReport);
+    /**
+     * 批量开发票
+     * @param purchaseReceiptReport
+     */
+    String openInvoiceList(PurchaseReceiptReport purchaseReceiptReport);
 }

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

@@ -67,26 +67,27 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
     @Override
     public String editCustomerInfo(CustomerInfo customerInfo) {
         //查询客户信息
-        if (customerInfo != null ){
+        CustomerInfo customerInfo1=this.selectById(customerInfo.getId());
+        if (customerInfo1 != null ){
             //0 修改定金比例
             if(customerInfo.getFlag()==0) {
-                customerInfo.setDepositRatio(customerInfo.getDepositRatio());
+                customerInfo1.setDepositRatio(customerInfo.getDepositRatio());
                 //更改客户信息
-                this.updateById(customerInfo);
+                this.updateById(customerInfo1);
                 return "OK";
             }
             //1 增加定金
             else if(customerInfo.getFlag()==1){
-                customerInfo.setTotalDeposit(customerInfo.getTotalDeposit()+customerInfo.getMoney());
+                customerInfo1.setTotalDeposit(customerInfo1.getTotalDeposit()+customerInfo.getMoney());
                 //更改客户信息
-                this.updateById(customerInfo);
+                this.updateById(customerInfo1);
                 return "OK";
             }
             //2 退回定金
             else {
-                customerInfo.setTotalDeposit(customerInfo.getTotalDeposit()-customerInfo.getMoney());
+                customerInfo1.setTotalDeposit(customerInfo1.getTotalDeposit()-customerInfo.getMoney());
                 //更改客户信息
-                this.updateById(customerInfo);
+                this.updateById(customerInfo1);
                 return "OK";
             }
         }

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

@@ -108,7 +108,6 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
 
     /**
      * 补货结转
-     *
      * @param purchaseReceiptReport
      * @return
      */
@@ -127,6 +126,79 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
         }
         return "OK";
     }
+    /**
+     * 出纳付款
+     * @param purchaseReceiptReport
+     * @return
+     */
+    @Override
+    public String payMoney(PurchaseReceiptReport purchaseReceiptReport) {
+        List<PurchaseReceiptReport> purchaseReceiptReportList=purchaseReceiptReport.getPurchaseReceiptReportList();
+        Float money = purchaseReceiptReport.getMoney();
+        //付款多条
+        if (!CollectionUtils.isEmpty(purchaseReceiptReportList)){
+            for (PurchaseReceiptReport purchaseReceiptReport1 : purchaseReceiptReportList) {
+                //付款金额大于本次循环未付金额
+                if (money >= purchaseReceiptReport1.getAmountNotPayable()) {
+                    money=money-purchaseReceiptReport1.getAmountNotPayable();
+                    //全部付款
+                    purchaseReceiptReport1.setStatus(StatusEnum.PUR_PAYaLL.getName());
+                    purchaseReceiptReport1.setStatusFlag(StatusEnum.PUR_PAYaLL.getFlag());
+                    purchaseReceiptReport1.setAmountEdPayable(purchaseReceiptReport1.getAmountEdPayable()+purchaseReceiptReport1.getAmountNotPayable());
+                    purchaseReceiptReport1.setAmountNotPayable(0.0f);
+                    this.updateById(purchaseReceiptReport1);
+                } else if (money> 0) {
+                    Float moneyTmp = money-purchaseReceiptReport1.getAmountNotPayable();
+                    //部分付款
+                    purchaseReceiptReport1.setStatus(StatusEnum.PUR_PAY.getName());
+                    purchaseReceiptReport1.setStatusFlag(StatusEnum.PUR_PAY.getFlag());
+                    purchaseReceiptReport1.setAmountEdPayable(purchaseReceiptReport1.getAmountEdPayable()+money);
+                    purchaseReceiptReport1.setAmountNotPayable(purchaseReceiptReport1.getAmountNotPayable()-money);
+                    this.updateById(purchaseReceiptReport1);
+                    money=moneyTmp;
+                } else {
+                    break;
+                }
+            }
+        }
+        return "ok";
+    }
+    /**
+     * 开发票
+     * @param purchaseReceiptReport
+     * @return
+     */
+    @Override
+    public String openInvoice(PurchaseReceiptReport purchaseReceiptReport) {
+        //查询采购入库报表
+        PurchaseReceiptReport purchaseReceiptReport1=this.selectById(purchaseReceiptReport.getId());
+        if (purchaseReceiptReport1 != null ){
+            //更改已开发票
+            purchaseReceiptReport1.setAlreadyInvoice(purchaseReceiptReport1.getAlreadyInvoice()+purchaseReceiptReport.getAlreadyInvoice());
+            //更改采购入库报表信息
+            this.updateById(purchaseReceiptReport1);
+            return "OK";
+        }
+        return "NG";
+    }
+
+    /**
+     * 批量开发票
+     * @param purchaseReceiptReport
+     */
+    @Override
+    public String openInvoiceList(PurchaseReceiptReport purchaseReceiptReport) {
+        List<PurchaseReceiptReport> purchaseReceiptReportList=purchaseReceiptReport.getPurchaseReceiptReportList();
+        //批量
+        if (!CollectionUtils.isEmpty(purchaseReceiptReportList)){
+            for (PurchaseReceiptReport purchaseReceiptReport1 : purchaseReceiptReportList) {
+                //已开发票金额等于已付金额
+                purchaseReceiptReport1.setAlreadyInvoice(purchaseReceiptReport1.getAmountEdPayable());
+                this.updateById(purchaseReceiptReport1);
+            }
+        }
+        return "ok";
+    }
 
 
     private List<String> getResourceIdList() {