销售出库报表

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

@@ -43,7 +43,7 @@ public class StockSaleReceiptReportController {
      * @return
      */
     @PostMapping("/api/disAndRemark")
-    public String disAndRemark(ContractManagementInfo contractManagementInfo){
+    public String disAndRemark(@RequestBody ContractManagementInfo contractManagementInfo){
         return stockSaleReceiptReportService.disAndRemark(contractManagementInfo);
     }
 
@@ -55,7 +55,7 @@ public class StockSaleReceiptReportController {
      * @return
      */
     @PostMapping("/api/editSettlementWeight")
-    public String editSettlementWeight(StockSaleReceiptReport stockSaleReceiptReport){
+    public String editSettlementWeight(@RequestBody StockSaleReceiptReport stockSaleReceiptReport){
         return stockSaleReceiptReportService.editSettlementWeight(stockSaleReceiptReport);
     }
 

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

@@ -10,10 +10,12 @@ import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -50,7 +52,15 @@ public class StockSaleReceiptReport extends BaseModel<StockSaleReceiptReport> {
     /**
      * 出库日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date deliveryDate;
+    /**
+     * 退库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date returnDate;
     /**
      * 净重（吨）
      */
@@ -86,6 +96,8 @@ public class StockSaleReceiptReport extends BaseModel<StockSaleReceiptReport> {
     /**
      * 收款日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date collectionDate;
     /**
      * 已开发票(元)
@@ -119,6 +131,11 @@ public class StockSaleReceiptReport extends BaseModel<StockSaleReceiptReport> {
      * 备注
      */
     private String remark;
+    /**
+     * 退库标识（1是）
+     */
+    private String returnFlag;
+
 
     /**
      * 模糊查询

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

@@ -11,6 +11,7 @@ import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.SalesDeliveryReport;
 import com.yh.saas.plugin.yiliangyiyun.entity.StockSaleReceiptReport;
 import com.yh.saas.plugin.yiliangyiyun.mapper.StockSaleReceiptReportMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
@@ -160,37 +161,30 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
     @Transactional(rollbackFor = Exception.class)
     public String collectMoney(StockSaleReceiptReport stockSaleReceiptReport) {
         List<StockSaleReceiptReport> stockSaleReceiptReportList = stockSaleReceiptReport.getStockSaleReceiptReportList();
-        Float money = stockSaleReceiptReport.getMoney();
-        //收款多条
         if (!CollectionUtils.isEmpty(stockSaleReceiptReportList)) {
-            for (StockSaleReceiptReport stockSaleReceiptReport1 : stockSaleReceiptReportList) {
+                StockSaleReceiptReport stockSaleReceiptReport1=stockSaleReceiptReportList.get(0);
                 StockSaleReceiptReport stockSaleReceiptReport2 = this.selectById(stockSaleReceiptReport1.getId());
-                //收款金额大于本次循环未收金额
-                if (money >= stockSaleReceiptReport1.getAmountNotReceivable()) {
-                    money = money - stockSaleReceiptReport1.getAmountNotReceivable();
-                    //全部收款
-//                    stockSaleReceiptReport1.setStatus(StatusEnum.PUR_COLLECTaLL.getName());
-//                    stockSaleReceiptReport1.setStatusFlag(StatusEnum.PUR_COLLECTaLL.getFlag());
-                    stockSaleReceiptReport1.setCollectionDate(stockSaleReceiptReport.getCollectionDate());
-                    stockSaleReceiptReport1.setCollectionScreenshot(stockSaleReceiptReport2.getCollectionScreenshot() != null ? stockSaleReceiptReport2.getCollectionScreenshot() + '$' + stockSaleReceiptReport.getCollectionScreenshot() : stockSaleReceiptReport.getCollectionScreenshot());
-                    stockSaleReceiptReport1.setAmountEdReceivable(stockSaleReceiptReport1.getAmountEdReceivable() + stockSaleReceiptReport1.getAmountNotReceivable());
+                stockSaleReceiptReport1.setCollectionDate(stockSaleReceiptReport.getCollectionDate());
+                stockSaleReceiptReport1.setCollectionScreenshot(stockSaleReceiptReport2.getCollectionScreenshot() != null ? stockSaleReceiptReport2.getCollectionScreenshot() + '$' + stockSaleReceiptReport.getCollectionScreenshot() : stockSaleReceiptReport.getCollectionScreenshot());
+                stockSaleReceiptReport1.setAmountEdReceivable(stockSaleReceiptReport2.getAmountEdReceivable() + stockSaleReceiptReport.getMoney());
+                if (stockSaleReceiptReport1.getAmountNotReceivable()>=stockSaleReceiptReport.getMoney()) {
+                    stockSaleReceiptReport1.setAmountNotReceivable(stockSaleReceiptReport2.getAmountIngReceivable() - stockSaleReceiptReport1.getAmountEdReceivable());
+                }
+                else{
+                    Float money=stockSaleReceiptReport.getMoney()-stockSaleReceiptReport1.getAmountNotReceivable();
                     stockSaleReceiptReport1.setAmountNotReceivable(0.0f);
-                    this.updateById(stockSaleReceiptReport1);
-                } else if (money > 0) {
-                    Float moneyTmp = money - stockSaleReceiptReport1.getAmountNotReceivable();
-                    //部分收款
-//                    stockSaleReceiptReport1.setStatus(StatusEnum.PUR_COLLECT.getName());
-//                    stockSaleReceiptReport1.setStatusFlag(StatusEnum.PUR_COLLECT.getFlag());
-                    stockSaleReceiptReport1.setCollectionDate(stockSaleReceiptReport.getCollectionDate());
-                    stockSaleReceiptReport1.setCollectionScreenshot(stockSaleReceiptReport2.getCollectionScreenshot() != null ? stockSaleReceiptReport2.getCollectionScreenshot() + '$' + stockSaleReceiptReport.getCollectionScreenshot() : stockSaleReceiptReport.getCollectionScreenshot());
-                    stockSaleReceiptReport1.setAmountEdReceivable(stockSaleReceiptReport1.getAmountEdReceivable() + money);
-                    stockSaleReceiptReport1.setAmountNotReceivable(stockSaleReceiptReport1.getAmountNotReceivable() - money);
-                    this.updateById(stockSaleReceiptReport1);
-                    money = moneyTmp;
-                } else {
-                    break;
+                    for (StockSaleReceiptReport stockSaleReceiptReport3 : stockSaleReceiptReportList) {
+                        if (stockSaleReceiptReport3.getAmountNotReceivable()>=money){
+                            stockSaleReceiptReport3.setAmountNotReceivable(stockSaleReceiptReport3.getAmountNotReceivable() - money);
+                        }
+                        else {
+                            money=money-stockSaleReceiptReport3.getAmountNotReceivable();
+                            stockSaleReceiptReport3.setAmountNotReceivable(0.0f);
+                        }
+                        this.updateById(stockSaleReceiptReport3);
+                    }
                 }
-            }
+                this.updateById(stockSaleReceiptReport1);
         }
         return "ok";
     }
@@ -219,7 +213,7 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
                 for (StockSaleReceiptReport stockSaleReceiptReport : stockSaleReceiptReportList) {
                     money = money + stockSaleReceiptReport.getAmountNotReceivable();
                 }
-                //有未付金额
+                //有未收金额
                 if (money > 0) {
                     contractManagementInfo.setReportStatus("待结算");
                 } else {

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

@@ -62,6 +62,8 @@
         approve_status as approveStatus,
         status_flag as statusFlag,
         approve_status as approveStatus,
+        return_date as returnDate,
+        return_flag as returnFlag,
         workflow_id as workflowId
         FROM stock_sale_receipt_report
         WHERE