From 7e8edd4b59fb22146b90d01ca38f75148f3fd774 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 20 四月 2026 17:57:18 +0800
Subject: [PATCH] feat(bom): 添加BOM管理功能模块,工序 管理,基础 - 新增CustomerPrivatePoolMapper.xml实现客户私池映射 - 添加SysLoginController支持登录验证和用户信息获取 - 创建TechnologyBomController提供BOM的增删改查接口 - 定义TechnologyBomDto数据传输对象 - 实现TechnologyBomMapper和相关XML映射文件 - 开发TechnologyBomService业务逻辑层 - 添加TechnologyBomStructure结构管理功能 - 集成Excel导入导出BOM数据功能 - 实现BOM结构树形展示和维护功能

---
 src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 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..1e31842 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -535,7 +535,7 @@
             Long aLong = customStorageMapper.selectCount(null);
             item.setInboundBatches(aLong.equals(0L) ? "绗�1鎵规(鑷畾涔夊叆搴�)" : "绗�"+ (aLong + 1) + "鎵规(鑷畾涔夊叆搴�)" );
             item.setCreateBy(loginUser.getNickName());
-            item.setCode(OrderUtils.countTodayByCreateTime(customStorageMapper, ""));
+            item.setCode(OrderUtils.countTodayByCreateTime(customStorageMapper, "", "code"));
             customStorageMapper.insert(item);
         });
         return AjaxResult.success("鑷畾涔夊叆搴撴垚鍔�");
@@ -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