From f088078e626e16b28d69cdbcbf514b30f1dcefe7 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 22 四月 2026 11:51:58 +0800
Subject: [PATCH] refactor(production): 优化生产订单及工单号生成逻辑
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
index aa83ce8..e1668ef 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.sales.dto.SimpleProductDto;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.stock.dto.StockInRecordDto;
@@ -29,6 +30,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
/**
* <p>
@@ -65,11 +67,12 @@
stockInRecordService.add(stockInRecordDto);
//鍐嶈繘琛屾柊澧炲簱瀛樻暟閲忓簱瀛�
//鍏堟煡璇㈠簱瀛樿〃涓殑浜у搧鏄惁瀛樺湪锛屼笉瀛樺湪鏂板锛屽瓨鍦ㄦ洿鏂� 闃冲厜褰╁嵃娣诲姞浠撳簱缂栫爜锛� 娣诲姞姣斿浠撳簱
- StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()).eq(StockInventory::getWarehouseCode,stockInventoryDto.getWarehouseCode()));
+ StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()));
if (ObjectUtils.isEmpty(oldStockInventory)) {
StockInventory newStockInventory = new StockInventory();
newStockInventory.setProductModelId(stockInventoryDto.getProductModelId());
newStockInventory.setQualitity(stockInventoryDto.getQualitity());
+ newStockInventory.setSubQualitity(stockInventoryDto.getSubQualitity());
newStockInventory.setVersion(1);
newStockInventory.setProductCode(stockInventoryDto.getProductCode());
newStockInventory.setWarehouseCode(stockInventoryDto.getWarehouseCode());
@@ -116,7 +119,7 @@
public R importStockInventory(MultipartFile file) {
try {
// 鏌ヨ鎵�鏈夌殑浜у搧
- List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectProduct();
+ List<SimpleProductDto> salesLedgerProducts = salesLedgerProductMapper.selectProduct();
ExcelUtil<StockInventoryExportData> util = new ExcelUtil<StockInventoryExportData>(StockInventoryExportData.class);
List<StockInventoryExportData> list = util.importExcel(file.getInputStream());
@@ -126,9 +129,16 @@
list.forEach(dto -> {
boolean matched = false;
- for (SalesLedgerProduct item : salesLedgerProducts) {
+ for (SimpleProductDto item : salesLedgerProducts) {
+ if (ObjectUtils.isEmpty(dto.getWarehouseCode())) {
+ return;
+ }
if (item.getProductCategory().equals(dto.getProductName()) &&
- item.getSpecificationModel().equals(dto.getModel())) {
+ item.getSpecificationModel().equals(dto.getModel())
+ && Optional.ofNullable(item.getUnit()).orElse("").equals(dto.getUnit())
+ && Optional.ofNullable(item.getSubUnit()).orElse("").equals(dto.getSubUnit())
+ ) {
+
StockInventoryDto stockInventoryDto = new StockInventoryDto();
stockInventoryDto.setWarehouseCode(dto.getWarehouseCode());
stockInventoryDto.setWarehouseName(dto.getWarehouseName());
@@ -136,6 +146,7 @@
stockInventoryDto.setRecordId(0L);
stockInventoryDto.setRecordType(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode());
stockInventoryDto.setQualitity(dto.getQualitity());
+ stockInventoryDto.setSubQualitity(dto.getSubQualitity());
stockInventoryDto.setProductModelId(item.getProductModelId());
this.addstockInventory(stockInventoryDto);
matched = true;
@@ -144,8 +155,8 @@
}
if (!matched) {
// 璁板綍鏈尮閰嶇殑鏁版嵁
- String unmatchedInfo = String.format("浜у搧鍚嶇О锛�%s锛岃鏍煎瀷鍙凤細%s",
- dto.getProductName(), dto.getModel());
+ String unmatchedInfo = String.format("浜у搧鍚嶇О锛�%s锛岃鏍煎瀷鍙凤細%s 涓诲崟浣嶏細%s 杈呭崟浣嶏細%s",
+ dto.getProductName(), dto.getModel(), dto.getUnit(), dto.getSubUnit());
unmatchedRecords.add(unmatchedInfo);
}
});
--
Gitblit v1.9.3