From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 91 ++++++++++++++++++++++-----------------------
1 files changed, 45 insertions(+), 46 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..f487aea 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -1,34 +1,28 @@
package com.ruoyi.sales.controller;
-import javax.servlet.http.HttpServletResponse;
-
+import cn.hutool.core.collection.CollUtil;
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.purchase.dto.SimpleReturnOrderGroupDto;
+import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
+import com.ruoyi.sales.dto.SalesLedgerProductDto;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.service.ISalesLedgerProductService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 浜у搧淇℃伅Controller
@@ -37,24 +31,23 @@
* @date 2025-05-08
*/
@RestController
+@RequiredArgsConstructor
@RequestMapping("/sales/product")
public class SalesLedgerProductController extends BaseController
{
- @Autowired
- private ISalesLedgerProductService salesLedgerProductService;
- @Autowired
- private ProcurementRecordService procurementRecordService;
- @Autowired
- private StockUtils stockUtils;
+ private final ISalesLedgerProductService salesLedgerProductService;
+ private final ProcurementRecordService procurementRecordService;
+ private final StockUtils stockUtils;
+ private final PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
/**
* 鍥炴鐧昏鍒嗛〉鏌ヨ
*/
@GetMapping("/listPageSalesLedger")
- public AjaxResult listPage(Page page, SalesLedgerProductDto salesLedgerProduct) {
+ public R<?> listPageSalesLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@@ -62,9 +55,9 @@
* 浠樻鐧昏鍒嗛〉鏌ヨ
*/
@GetMapping("/listPagePurchaseLedger")
- public AjaxResult listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
+ public R<?> listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@@ -72,8 +65,15 @@
* 鏌ヨ浜у搧淇℃伅鍒楄〃
*/
@GetMapping("/list")
- public AjaxResult list(SalesLedgerProduct salesLedgerProduct) {
+ public R<?> list(SalesLedgerProduct salesLedgerProduct) {
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
+ if (CollUtil.isEmpty(list)) {
+ return R.ok(list);
+ }
+ List<Long> productIds = list.stream().map(SalesLedgerProduct::getProductModelId).collect(Collectors.toList());
+ List<SimpleReturnOrderGroupDto> groupListByProductIds = purchaseReturnOrderProductsMapper.getReturnOrderGroupListByProductIds(productIds);
+ Map<Long, BigDecimal> returnOrderGroupDtoMap = groupListByProductIds.stream().collect(Collectors.toMap(SimpleReturnOrderGroupDto::getProductModelId, item -> item.getSumReturnQuantity()));
+
list.forEach(item -> {
if (item.getFutureTickets().compareTo(BigDecimal.ZERO) == 0) {
item.setFutureTickets(BigDecimal.ZERO);
@@ -81,13 +81,6 @@
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);
@@ -95,8 +88,12 @@
item.setApproveStatus(1);
}
}
+ // 缁熻閫�璐ф暟閲�
+ BigDecimal returnQuality = returnOrderGroupDtoMap.getOrDefault(item.getProductModelId(), BigDecimal.ZERO);
+ item.setReturnQuality(returnQuality);
+ item.setAvailableQuality(item.getQuantity().subtract(returnQuality));
});
- return AjaxResult.success(list);
+ return R.ok(list);
}
/**
@@ -115,9 +112,9 @@
* 鑾峰彇浜у搧淇℃伅璇︾粏淇℃伅
*/
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
+ public R<?> getInfo(@PathVariable("id") Long id)
{
- return success(salesLedgerProductService.selectSalesLedgerProductById(id));
+ return R.ok(salesLedgerProductService.selectSalesLedgerProductById(id));
}
/**
@@ -125,9 +122,10 @@
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.INSERT)
@PostMapping ("/addOrUpdateSalesLedgerProduct")
- public AjaxResult add(@RequestBody SalesLedgerProduct salesLedgerProduct)
+ public R<?> add(@RequestBody SalesLedgerProduct salesLedgerProduct)
{
- return toAjax(salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct));
+ salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct);
+ return R.ok();
}
/**
@@ -135,12 +133,13 @@
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.DELETE)
@DeleteMapping("/delProduct")
- public AjaxResult remove(@RequestBody Long[] ids)
+ public R<?> remove(@RequestBody Long[] ids)
{
if (ids == null || ids.length == 0) {
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return toAjax(salesLedgerProductService.deleteSalesLedgerProductByIds(ids));
+ salesLedgerProductService.deleteSalesLedgerProductByIds(ids);
+ return R.ok();
}
//鏍规嵁浜у搧id鑾峰彇bom鍒ゆ柇搴撳瓨鏄惁鍏呰冻
--
Gitblit v1.9.3