From f171534eb89eca16ef1834ef1daa73d95b1bf7cf Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 17:58:36 +0800
Subject: [PATCH] feat(approval): 添加发货审批产品信息展示功能
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 73 ++++++++++++++++--------------------
1 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index 79e6cb5..a403e60 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -1,32 +1,22 @@
package com.ruoyi.sales.controller;
-import javax.servlet.http.HttpServletResponse;
-
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.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 org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
@@ -38,8 +28,7 @@
*/
@RestController
@RequestMapping("/sales/product")
-public class SalesLedgerProductController extends BaseController
-{
+public class SalesLedgerProductController extends BaseController {
@Autowired
private ISalesLedgerProductService salesLedgerProductService;
@Autowired
@@ -53,7 +42,7 @@
*/
@GetMapping("/listPageSalesLedger")
public AjaxResult listPage(Page page, SalesLedgerProductDto salesLedgerProduct) {
- IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
+ IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page, salesLedgerProduct);
return AjaxResult.success(list);
}
@@ -63,7 +52,7 @@
*/
@GetMapping("/listPagePurchaseLedger")
public AjaxResult listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
- IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
+ IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page, salesLedgerProduct);
return AjaxResult.success(list);
}
@@ -72,26 +61,27 @@
* 鏌ヨ浜у搧淇℃伅鍒楄〃
*/
@GetMapping("/list")
- public AjaxResult list(SalesLedgerProduct salesLedgerProduct)
- {
+ public AjaxResult list(SalesLedgerProduct salesLedgerProduct) {
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
list.forEach(item -> {
- if (item.getFutureTickets().compareTo(BigDecimal.ZERO) == 0) {
- item.setFutureTickets(item.getQuantity());
- }
+ if (item.getFutureTickets().compareTo(BigDecimal.ZERO) == 0) {
+ item.setFutureTickets(BigDecimal.ZERO);
+ }
if (item.getFutureTicketsAmount().compareTo(BigDecimal.ZERO) == 0) {
- item.setFutureTicketsAmount(item.getTaxInclusiveTotalPrice());
+ 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");
- if(stockQuantity != null) {
+// BigDecimal stockQuantity = stockUtils.getStockQuantity(item.getProductModelId()).get("stockQuantity");
+
// ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
- if (item.getQuantity().compareTo(stockQuantity) <= 0 && item.getApproveStatus() == 0) {
+ if (item.getApproveStatus() != 2) {
+ if (item.getHasSufficientStock() == 0) {
+ item.setApproveStatus(0);
+ } else {
item.setApproveStatus(1);
- salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
}
}
});
@@ -103,8 +93,7 @@
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SalesLedgerProduct salesLedgerProduct)
- {
+ public void export(HttpServletResponse response, SalesLedgerProduct salesLedgerProduct) {
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
ExcelUtil<SalesLedgerProduct> util = new ExcelUtil<SalesLedgerProduct>(SalesLedgerProduct.class);
util.exportExcel(response, list, "浜у搧淇℃伅鏁版嵁");
@@ -114,8 +103,7 @@
* 鑾峰彇浜у搧淇℃伅璇︾粏淇℃伅
*/
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(salesLedgerProductService.selectSalesLedgerProductById(id));
}
@@ -123,9 +111,8 @@
* 鏂板淇敼浜у搧淇℃伅
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.INSERT)
- @PostMapping ("/addOrUpdateSalesLedgerProduct")
- public AjaxResult add(@RequestBody SalesLedgerProduct salesLedgerProduct)
- {
+ @PostMapping("/addOrUpdateSalesLedgerProduct")
+ public AjaxResult add(@RequestBody SalesLedgerProduct salesLedgerProduct) {
return toAjax(salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct));
}
@@ -133,9 +120,8 @@
* 鍒犻櫎浜у搧淇℃伅
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.DELETE)
- @DeleteMapping("/delProduct")
- public AjaxResult remove(@RequestBody Long[] ids)
- {
+ @DeleteMapping("/delProduct")
+ public AjaxResult remove(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
@@ -145,6 +131,11 @@
//鏍规嵁浜у搧id鑾峰彇bom鍒ゆ柇搴撳瓨鏄惁鍏呰冻
@GetMapping("/judgmentInventory")
public R judgmentInventory(SalesLedgerProduct salesLedgerProduct) {
- return salesLedgerProductService.judgmentInventory(salesLedgerProduct);
+ return salesLedgerProductService.judgmentInventory(salesLedgerProduct);
+ }
+
+ @GetMapping("/getById")
+ public R getById(SalesLedgerProduct salesLedgerProduct) {
+ return R.ok(salesLedgerProductService.getById(salesLedgerProduct));
}
}
--
Gitblit v1.9.3