From 7746f1fcb9b018735df79de7055170e6b1720775 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 09 六月 2026 17:45:06 +0800
Subject: [PATCH] 增加废品发货信息接口

---
 src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
index 4b0a36e..9648ee1 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
@@ -90,6 +90,11 @@
     }
 
     @Override
+    public List<StockUninventoryDto> getWasteByModelId(Long productModelId) {
+        return stockUninventoryMapper.getWasteByModelId(productModelId);
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer addStockUninventory(StockUninventoryDto stockUninventoryDto) {
         String inventoryType = resolveInventoryType(stockUninventoryDto);
@@ -151,7 +156,8 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer addStockInRecordOnly(StockUninventoryDto stockUninventoryDto) {
-        stockUninventoryDto.setType(resolveInventoryType(stockUninventoryDto));
+        String inventoryType = resolveInventoryType(stockUninventoryDto);
+        stockUninventoryDto.setType(inventoryType);
         StockInRecordDto stockInRecordDto = new StockInRecordDto();
         stockInRecordDto.setRecordId(stockUninventoryDto.getRecordId());
         stockInRecordDto.setRecordType(stockUninventoryDto.getRecordType());
@@ -162,7 +168,11 @@
         }
         stockInRecordDto.setBatchNo(batchNo);
         stockInRecordDto.setProductModelId(stockUninventoryDto.getProductModelId());
-        stockInRecordDto.setType("1");
+        if (UNQUALIFIED_TYPE.equals(inventoryType)) {
+            stockInRecordDto.setType("1");
+        } else {
+            stockInRecordDto.setType("2");
+        }
         stockInRecordDto.setRemark(stockUninventoryDto.getRemark());
         stockInRecordService.add(stockInRecordDto);
         return 1;

--
Gitblit v1.9.3