From a122cfc45d18b6e679029a88eb342e9081df6595 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 12 五月 2026 09:14:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_浪潮_pro

---
 src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 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 d712518..d053614 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -10,7 +10,6 @@
 import com.ruoyi.basic.mapper.ProductModelMapper;
 import com.ruoyi.basic.pojo.ProductModel;
 import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -115,7 +114,7 @@
     //鍑哄簱璋冪敤
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean subtractStockInventory(StockInventoryDto stockInventoryDto) {
+    public StockOutRecordDto subtractStockInventory(StockInventoryDto stockInventoryDto) {
         LambdaQueryWrapper<StockInventory> eq = new QueryWrapper<StockInventory>().lambda()
             .eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId());
         if (StringUtils.isEmpty(stockInventoryDto.getBatchNo())) {
@@ -130,9 +129,11 @@
         stockOutRecordDto.setRecordType(stockInventoryDto.getRecordType());
         stockOutRecordDto.setStockOutNum(stockInventoryDto.getQualitity());
         stockOutRecordDto.setBatchNo(stockInventoryDto.getBatchNo());
+        stockOutRecordDto.setApprovalStatus(0);
         stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
         stockOutRecordDto.setType("0");
-        stockOutRecordService.add(stockOutRecordDto);
+        Long id = stockOutRecordService.add(stockOutRecordDto);
+        stockInventoryDto.setId(id);
 
 
         StockInventory oldStockInventory = stockInventoryMapper.selectOne(eq);
@@ -148,12 +149,12 @@
         }
 
         stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
-        return true;
+        return stockOutRecordDto;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean addStockInRecordOnly(StockInventoryDto stockInventoryDto) {
+    public StockInRecordDto addStockInRecordOnly(StockInventoryDto stockInventoryDto) {
         String batchNo = StringUtils.trim(stockInventoryDto.getBatchNo());
         if (StringUtils.isEmpty(batchNo)) {
             batchNo = generateAutoBatchNo(stockInventoryDto.getProductModelId());
@@ -165,11 +166,13 @@
         stockInRecordDto.setRecordType(stockInventoryDto.getRecordType());
         stockInRecordDto.setStockInNum(stockInventoryDto.getQualitity());
         stockInRecordDto.setBatchNo(batchNo);
+        stockInRecordDto.setApprovalStatus(0);
         stockInRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
         stockInRecordDto.setType("0");
         stockInRecordDto.setRemark(stockInventoryDto.getRemark());
-        stockInRecordService.add(stockInRecordDto);
-        return true;
+        Long add = stockInRecordService.add(stockInRecordDto);
+        stockInRecordDto.setId( add);
+        return stockInRecordDto;
     }
 
     //瑙勫垯鐢熸垚锛�20260424-浜у搧缂栧彿-001
@@ -250,7 +253,7 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean addStockOutRecordOnly(StockInventoryDto stockInventoryDto) {
+    public StockOutRecordDto addStockOutRecordOnly(StockInventoryDto stockInventoryDto) {
         LambdaQueryWrapper<StockInventory> eq = new LambdaQueryWrapper<>();
         eq.eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId());
         if (StringUtils.isEmpty(stockInventoryDto.getBatchNo())) {
@@ -286,8 +289,9 @@
         stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
         stockOutRecordDto.setType("0");
         stockOutRecordDto.setRemark(stockInventoryDto.getRemark());
-        stockOutRecordService.add(stockOutRecordDto);
-        return true;
+        Long add = stockOutRecordService.add(stockOutRecordDto);
+        stockInventoryDto.setId(add);
+        return stockOutRecordDto;
     }
 
     @Override
@@ -345,7 +349,7 @@
                     if (dto.getUnQualifiedQuantity() != null && dto.getUnQualifiedQuantity().compareTo(BigDecimal.ZERO) > 0) {
                         StockUninventoryDto stockUninventoryDto = new StockUninventoryDto();
                         stockUninventoryDto.setRecordId(0L);
-                        stockUninventoryDto.setRecordType(StockInUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode());
+                        stockUninventoryDto.setRecordType(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode());
                         stockUninventoryDto.setQualitity(dto.getUnQualifiedQuantity());
                         stockUninventoryDto.setRemark(dto.getRemark());
 
@@ -434,4 +438,19 @@
     public List<StockInventory> getByModelId(Long modelId) {
         return stockInventoryMapper.getByModelId(modelId);
     }
+
+    @Override
+    public List<StockInventoryDto> selectStockInvenrory(Long productModelId) {
+        return stockInventoryMapper.selectStockInvenrory(productModelId);
+    }
+
+    @Override
+    public IPage<StockInventoryDto> pagestockInventoryNoQua(Page page, StockInventoryDto stockInventoryDto) {
+        return stockInventoryMapper.pagestockInventoryNoQua(page, stockInventoryDto);
+    }
+
+    @Override
+    public boolean updateLocked(Long productModelId, String batchNo, boolean b) {
+        return stockInventoryMapper.updateLocked(productModelId, batchNo, b) > 0;
+    }
 }

--
Gitblit v1.9.3