From e6d90f4aefc88f6317578bd9c0c17c768ccb96e4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 16 一月 2026 10:07:20 +0800
Subject: [PATCH] 生产订单增加查看bom结构

---
 src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index d0d7625..d69d27a 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -24,6 +24,7 @@
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -48,13 +49,19 @@
     {
         List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
         list.forEach(item -> {
+                if (item.getFutureTickets().compareTo(BigDecimal.ZERO) == 0) {
+                    item.setFutureTickets(item.getQuantity());
+                }
+            if (item.getFutureTicketsAmount().compareTo(BigDecimal.ZERO) == 0) {
+                item.setFutureTicketsAmount(item.getTaxInclusiveTotalPrice());
+            }
             ProcurementPageDto procurementDto = new ProcurementPageDto();
             procurementDto.setSalesLedgerProductId(item.getId());
             procurementDto.setProductCategory(item.getProductCategory());
             IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(new Page<>(1,-1), procurementDto);
             if(result.getRecords().size()>0) {
                 ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
-                if (item.getQuantity().compareTo(procurementDtoCopy.getInboundNum0()) >= 0) {
+                if (item.getQuantity().compareTo(procurementDtoCopy.getInboundNum0()) >= 0 && item.getApproveStatus() == 0) {
                     item.setApproveStatus(1);
                     salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
                 }

--
Gitblit v1.9.3