From d7c69d76e9c81464c698199b90ec4a339a18b257 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 27 三月 2026 16:06:17 +0800
Subject: [PATCH] feat: 销售订单标签打印
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 92 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 87 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index a42f2b4..aaedff4 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -2,7 +2,20 @@
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.collection.CollUtil;
+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.purchase.dto.SimpleReturnOrderGroupDto;
+import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
+import com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts;
+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;
@@ -19,11 +32,14 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
+import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 浜у搧淇℃伅Controller
- *
+ *
* @author ruoyi
* @date 2025-05-08
*/
@@ -33,16 +49,76 @@
{
@Autowired
private ISalesLedgerProductService salesLedgerProductService;
+ @Autowired
+ private ProcurementRecordService procurementRecordService;
+ @Autowired
+ private StockUtils stockUtils;
+
+ @Autowired
+ private PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
+
+
+ /**
+ * 鍥炴鐧昏鍒嗛〉鏌ヨ
+ */
+ @GetMapping("/listPageSalesLedger")
+ public AjaxResult listPage(Page page, SalesLedgerProductDto salesLedgerProduct) {
+ IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
+ return AjaxResult.success(list);
+ }
+
+
+ /**
+ * 浠樻鐧昏鍒嗛〉鏌ヨ
+ */
+ @GetMapping("/listPagePurchaseLedger")
+ public AjaxResult listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
+ IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
+ return AjaxResult.success(list);
+ }
+
/**
* 鏌ヨ浜у搧淇℃伅鍒楄〃
*/
@GetMapping("/list")
- public TableDataInfo list(SalesLedgerProduct salesLedgerProduct)
- {
- startPage();
+ public AjaxResult list(SalesLedgerProduct salesLedgerProduct) {
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
- return getDataTable(list);
+ if (CollUtil.isEmpty(list)) {
+ return AjaxResult.success(list);
+ }
+ //
+ List<Long> productIds = list.stream().map(SalesLedgerProduct::getId).collect(Collectors.toList());
+ List<SimpleReturnOrderGroupDto> groupListByProductIds = purchaseReturnOrderProductsMapper.getReturnOrderGroupListByProductIds(productIds);
+ Map<Long, BigDecimal> returnOrderGroupDtoMap = groupListByProductIds.stream().collect(Collectors.toMap(SimpleReturnOrderGroupDto::getSalesLedgerProductId, item -> item.getSumReturnQuantity()));
+
+ list.forEach(item -> {
+ if (item.getFutureTickets().compareTo(BigDecimal.ZERO) == 0) {
+ item.setFutureTickets(BigDecimal.ZERO);
+ }
+ if (item.getFutureTicketsAmount().compareTo(BigDecimal.ZERO) == 0) {
+ item.setFutureTicketsAmount(BigDecimal.ZERO);
+ }
+// ProcurementPageDto procurementDto = new ProcurementPageDto();
+// procurementDto.setSalesLedgerProductId(item.getId());
+// procurementDto.setProductCategory(item.getProductCategory());
+// IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(new Page<>(1,-1), procurementDto);
+// BigDecimal stockQuantity = stockUtils.getStockQuantity(item.getProductModelId()).get("stockQuantity");
+
+// ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
+ if (item.getApproveStatus() != 2) {
+ if (item.getHasSufficientStock() == 0) {
+ item.setApproveStatus(0);
+ } else {
+ item.setApproveStatus(1);
+ }
+ }
+ // 缁熻閫�璐ф暟閲�
+ BigDecimal returnQuality = returnOrderGroupDtoMap.getOrDefault(item.getId(), BigDecimal.ZERO);
+ item.setReturnQuality(returnQuality);
+ item.setAvailableQuality(item.getQuantity().subtract(returnQuality));
+ });
+ return AjaxResult.success(list);
}
/**
@@ -88,4 +164,10 @@
}
return toAjax(salesLedgerProductService.deleteSalesLedgerProductByIds(ids));
}
+
+ //鏍规嵁浜у搧id鑾峰彇bom鍒ゆ柇搴撳瓨鏄惁鍏呰冻
+ @GetMapping("/judgmentInventory")
+ public R judgmentInventory(SalesLedgerProduct salesLedgerProduct) {
+ return salesLedgerProductService.judgmentInventory(salesLedgerProduct);
+ }
}
--
Gitblit v1.9.3