From 79e6debd3079af53321225835aee191334c14c03 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 08 四月 2026 17:35:59 +0800
Subject: [PATCH] feat(sales): 添加销售台账产品管理功能
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index aed72ef..de51845 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -1,32 +1,25 @@
package com.ruoyi.sales.controller;
-import javax.servlet.http.HttpServletResponse;
-
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy;
-import com.ruoyi.procurementrecord.service.ProcurementRecordService;
-import com.ruoyi.procurementrecord.utils.StockUtils;
-import com.ruoyi.sales.dto.SalesLedgerProductDto;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import com.ruoyi.sales.service.ISalesLedgerProductService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
+import com.ruoyi.procurementrecord.utils.StockUtils;
+import com.ruoyi.sales.dto.SalesLedgerProductDto;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.pojo.ShippingInfo;
+import com.ruoyi.sales.service.ISalesLedgerProductService;
+import com.ruoyi.sales.service.ShippingInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
@@ -46,6 +39,8 @@
private ProcurementRecordService procurementRecordService;
@Autowired
private StockUtils stockUtils;
+ @Autowired
+ private ShippingInfoService shippingInfoService;
/**
@@ -75,6 +70,20 @@
public AjaxResult list(SalesLedgerProduct salesLedgerProduct) {
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
list.forEach(item -> {
+ List<ShippingInfo> shippings = shippingInfoService.list(new LambdaQueryWrapper<ShippingInfo>()
+ .eq(ShippingInfo::getSalesLedgerId, salesLedgerProduct.getSalesLedgerId())
+ .eq(ShippingInfo::getSalesLedgerProductId, item.getId()));
+ BigDecimal total = shippings.stream().map(ShippingInfo::getShippedQty).reduce(BigDecimal.ZERO, BigDecimal::add);
+ item.setShippedQty(total);
+ if (total.compareTo(BigDecimal.ZERO) == 0) {
+ item.setShippingStatus("寰呭彂璐�");
+ }
+ if (total.compareTo(item.getQuantity()) == 0) {
+ item.setShippingStatus("宸插彂璐�");
+ }
+ if (total.compareTo(item.getQuantity()) < 0) {
+ item.setShippingStatus("鍙戣揣涓�");
+ }
if (item.getFutureTickets().compareTo(BigDecimal.ZERO) == 0) {
item.setFutureTickets(BigDecimal.ZERO);
}
--
Gitblit v1.9.3