From 579d785db5254ad64b02eb58cb696c2447821dd3 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 27 五月 2026 11:25:44 +0800
Subject: [PATCH] feat(stock): 完善成品库存维度解析和生产投料扣减逻辑 - 在电压参数解析中增加非成品情况下的空值返回 - 在工艺路线成品类别判断中增加非成品情况下的空值返回 - 添加光检外观和包装工序跳过库存扣减的功能 - 修改生产投料环节仅对非光检包装工序执行库存扣减
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 2ab812a..4808e75 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -327,6 +327,11 @@
// 绗竷姝�-1锛氭姇鍏ユ暟閲忓己鍒跺彇鍓嶇浼犲叆鐨� bomInputQty
BigDecimal inputBaseQty = bomInputQty;
+ // 绗竷姝�-2锛氬厜妫�澶栬鍜屽寘瑁呭伐搴忎笉鎵ｅ噺搴撳瓨
+ String currentProcessName = productProcess.getName() == null ? "" : productProcess.getName().trim();
+ boolean shouldSkipStockDeduction = PROCESS_OPTICAL_INSPECTION.equals(currentProcessName)
+ || PROCESS_PACKAGING.equals(currentProcessName);
+
for (ProductStructureDto productStructureDto : productStructureDtos) {
if (productStructureDto.getProductModelId() == null) {
throw new ServiceException("鎶曞叆鐗╂枡浜у搧鍨嬪彿涓嶈兘涓虹┖");
@@ -357,14 +362,16 @@
productionProductInput.setProductMainId(productionProductMain.getId());
productionProductInputMapper.insert(productionProductInput);
- stockUtils.substractStock(
- productStructureDto.getProductModelId(),
- needQty,
- StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode(),
- productionProductMain.getId(),
- null,
- null
- );
+ if (!shouldSkipStockDeduction) {
+ stockUtils.substractStock(
+ productStructureDto.getProductModelId(),
+ needQty,
+ StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode(),
+ productionProductMain.getId(),
+ null,
+ null
+ );
+ }
}
// 绗叓姝ワ細鍐欎骇鍑鸿褰曞苟璁＄畻鏈鍚堟牸鏁伴噺
@@ -852,4 +859,4 @@
}
return null;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3