From 4e7cc75a569c4e3ec31343fc5cec9db48b7acb0b Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 15 四月 2026 16:02:57 +0800
Subject: [PATCH] refactor(ProductModelService): 优化部门ID查询条件判断逻辑

---
 src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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..35b0916 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -65,11 +65,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());
@@ -127,6 +128,9 @@
             list.forEach(dto -> {
                 boolean matched = false;
                 for (SalesLedgerProduct item : salesLedgerProducts) {
+                    if (ObjectUtils.isEmpty(dto.getWarehouseCode())) {
+                        return;
+                    }
                     if (item.getProductCategory().equals(dto.getProductName()) &&
                             item.getSpecificationModel().equals(dto.getModel())) {
                         StockInventoryDto stockInventoryDto = new StockInventoryDto();
@@ -136,6 +140,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;

--
Gitblit v1.9.3