From 4e273eb9b2b7cb206326d979b62af37f64e83057 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 26 六月 2026 16:16:15 +0800
Subject: [PATCH] 删除打印
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 97 ++++++++++++++----------------------------------
1 files changed, 28 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index f487aea..9efcc89 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -1,28 +1,19 @@
package com.ruoyi.sales.controller;
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.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.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
@@ -36,64 +27,34 @@
public class SalesLedgerProductController extends BaseController
{
private final ISalesLedgerProductService salesLedgerProductService;
- private final ProcurementRecordService procurementRecordService;
- private final StockUtils stockUtils;
- private final PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
-
-
- /**
- * 鍥炴鐧昏鍒嗛〉鏌ヨ
- */
- @GetMapping("/listPageSalesLedger")
- public R<?> listPageSalesLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
- IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
- return R.ok(list);
- }
-
-
- /**
- * 浠樻鐧昏鍒嗛〉鏌ヨ
- */
- @GetMapping("/listPagePurchaseLedger")
- public R<?> listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
- IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
- return R.ok(list);
- }
/**
* 鏌ヨ浜у搧淇℃伅鍒楄〃
*/
@GetMapping("/list")
- public R<?> list(SalesLedgerProduct salesLedgerProduct) {
+ public AjaxResult 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);
- }
- if (item.getFutureTicketsAmount().compareTo(BigDecimal.ZERO) == 0) {
- item.setFutureTicketsAmount(BigDecimal.ZERO);
- }
- if (item.getApproveStatus() != 2) {
- if (item.getHasSufficientStock() == 0) {
- item.setApproveStatus(0);
- } else {
- item.setApproveStatus(1);
+ if (CollUtil.isNotEmpty(list)) {
+ list.forEach(item -> {
+ if (item.getApproveStatus() != 2) {
+ if (item.getHasSufficientStock() == 0) {
+ item.setApproveStatus(0);
+ } else {
+ item.setApproveStatus(1);
+ }
}
- }
- // 缁熻閫�璐ф暟閲�
- BigDecimal returnQuality = returnOrderGroupDtoMap.getOrDefault(item.getProductModelId(), BigDecimal.ZERO);
- item.setReturnQuality(returnQuality);
- item.setAvailableQuality(item.getQuantity().subtract(returnQuality));
- });
- return R.ok(list);
+ java.math.BigDecimal returnQuantity = item.getReturnQuantity() == null
+ ? java.math.BigDecimal.ZERO
+ : item.getReturnQuantity();
+ java.math.BigDecimal quantity = item.getQuantity() == null
+ ? java.math.BigDecimal.ZERO
+ : item.getQuantity();
+ item.setReturnQuantity(returnQuantity);
+ item.setAvailableQuality(quantity.subtract(returnQuantity));
+ });
+ }
+ return AjaxResult.success(list);
}
/**
@@ -112,9 +73,9 @@
* 鑾峰彇浜у搧淇℃伅璇︾粏淇℃伅
*/
@GetMapping(value = "/{id}")
- public R<?> getInfo(@PathVariable("id") Long id)
+ public AjaxResult getInfo(@PathVariable("id") Long id)
{
- return R.ok(salesLedgerProductService.selectSalesLedgerProductById(id));
+ return success(salesLedgerProductService.selectSalesLedgerProductById(id));
}
/**
@@ -122,10 +83,9 @@
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.INSERT)
@PostMapping ("/addOrUpdateSalesLedgerProduct")
- public R<?> add(@RequestBody SalesLedgerProduct salesLedgerProduct)
+ public AjaxResult add(@RequestBody SalesLedgerProduct salesLedgerProduct)
{
- salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct);
- return R.ok();
+ return toAjax(salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct));
}
/**
@@ -133,13 +93,12 @@
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.DELETE)
@DeleteMapping("/delProduct")
- public R<?> remove(@RequestBody Long[] ids)
+ public AjaxResult remove(@RequestBody Long[] ids)
{
if (ids == null || ids.length == 0) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- salesLedgerProductService.deleteSalesLedgerProductByIds(ids);
- return R.ok();
+ return toAjax(salesLedgerProductService.deleteSalesLedgerProductByIds(ids));
}
//鏍规嵁浜у搧id鑾峰彇bom鍒ゆ柇搴撳瓨鏄惁鍏呰冻
--
Gitblit v1.9.3