From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面,新增一个编辑按钮,可以对已审核的订单进行单价修 改。 3.新增反审核按钮,对已审核的订单进行反审核,反审核之后会保存当前订 单的数据快照,便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。

---
 src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 3ee9ca7..19509a3 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -781,7 +781,8 @@
                     .updateTime(LocalDateTime.now())
                     .updateUser(loginUser.getUserId())
                     .createBy(procurementDto.getNickName())
-                    .productModelId(detail.getProductModelId());
+                    .productModelId(detail.getProductModelId())
+                    .qualityInspectId(ObjectUtils.isNotNull(procurementDto.getQualityInspectId())?procurementDto.getQualityInspectId():0L);
             this.save(procurementRecordBuilder.build());
             // 鍏ュ簱鎴愬姛鍑忔帀閲囪喘鏁伴噺
 //            LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -881,16 +882,10 @@
         }
         return procurementPageDtoCopyIPage;
     }
+
     @Override
-    public IPage<ProductModel> listPageProductionStock(Page page) {
-        ProductModel productModel = new ProductModel();
-        IPage<ProductModel> iPage = productModelMapper.listPageProductModel(page, productModel);
-        iPage.getRecords().forEach(item -> {
-            item.setInboundNum(stockUtils.getStockQuantity(item.getId()).get("inboundNum"));
-            item.setOutboundNum(stockUtils.getStockQuantity(item.getId()).get("outboundNum"));
-            item.setStockQuantity(stockUtils.getStockQuantity(item.getId()).get("stockQuantity"));
-        });
-        return iPage;
+    public IPage<ProductModel> listPageProductionStock(Page page, ProcurementPageDto dto) {
+        return productModelMapper.listPageProductionStock(page, dto);
     }
 
     @Override

--
Gitblit v1.9.3