From 17a7a0c0df3dbc3e6225dddb55f6332deccdb201 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 03 六月 2026 11:38:30 +0800
Subject: [PATCH] 浪潮部署

---
 src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 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 1459701..822d6c8 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
@@ -25,7 +25,10 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * <p>
@@ -60,6 +63,11 @@
         } else {
             wrapper.eq(StockUninventory::getBatchNo, stockUninventoryDto.getBatchNo());
         }
+        if (ObjectUtils.isEmpty(stockUninventoryDto.getBatchNo())) {
+            String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHHmm"));
+            int suffix = ThreadLocalRandom.current().nextInt(100, 1000);
+            stockUninventoryDto.setBatchNo("PY" + time + suffix);
+        }
         //鏂板鍏ュ簱璁板綍鍐嶆坊鍔犲簱瀛�
         StockInRecordDto stockInRecordDto = new StockInRecordDto();
         stockInRecordDto.setRecordId(stockUninventoryDto.getRecordId());
@@ -72,20 +80,20 @@
         stockInRecordService.add(stockInRecordDto);
         //鍐嶈繘琛屾柊澧炲簱瀛樻暟閲忓簱瀛�
         //鍏堟煡璇㈠簱瀛樿〃涓殑浜у搧鏄惁瀛樺湪锛屼笉瀛樺湪鏂板锛屽瓨鍦ㄦ洿鏂�
-        StockUninventory oldStockUnInventory = stockUninventoryMapper.selectOne(wrapper);
-        if (ObjectUtils.isEmpty(oldStockUnInventory)) {
-            StockUninventory newStockUnInventory = new StockUninventory();
-            newStockUnInventory.setProductModelId(stockUninventoryDto.getProductModelId());
-            newStockUnInventory.setQualitity(stockUninventoryDto.getQualitity());
-            newStockUnInventory.setLockedQuantity(stockUninventoryDto.getLockedQuantity());
-            newStockUnInventory.setBatchNo(stockUninventoryDto.getBatchNo());
-            newStockUnInventory.setWarehouseInfoId(stockUninventoryDto.getWarehouseInfoId());
-            newStockUnInventory.setVersion(1);
-            newStockUnInventory.setRemark(stockUninventoryDto.getRemark());
-            stockUninventoryMapper.insert(newStockUnInventory);
-        }else {
-            stockUninventoryMapper.updateAddStockUnInventory(stockUninventoryDto);
-        }
+//        StockUninventory oldStockUnInventory = stockUninventoryMapper.selectOne(wrapper);
+//        if (ObjectUtils.isEmpty(oldStockUnInventory)) {
+//            StockUninventory newStockUnInventory = new StockUninventory();
+//            newStockUnInventory.setProductModelId(stockUninventoryDto.getProductModelId());
+//            newStockUnInventory.setQualitity(stockUninventoryDto.getQualitity());
+//            newStockUnInventory.setLockedQuantity(stockUninventoryDto.getLockedQuantity());
+//            newStockUnInventory.setBatchNo(stockUninventoryDto.getBatchNo());
+//            newStockUnInventory.setWarehouseInfoId(stockUninventoryDto.getWarehouseInfoId());
+//            newStockUnInventory.setVersion(1);
+//            newStockUnInventory.setRemark(stockUninventoryDto.getRemark());
+//            stockUninventoryMapper.insert(newStockUnInventory);
+//        }else {
+//            stockUninventoryMapper.updateAddStockUnInventory(stockUninventoryDto);
+//        }
         return 1;
     }
 
@@ -160,6 +168,7 @@
         stockOutRecordDto.setRecordId(stockUninventoryDto.getRecordId());
         stockOutRecordDto.setRecordType(stockUninventoryDto.getRecordType());
         stockOutRecordDto.setStockOutNum(stockUninventoryDto.getQualitity());
+        stockOutRecordDto.setWarehouseInfoId(stockUninventoryDto.getWarehouseInfoId());
         stockOutRecordDto.setBatchNo(stockUninventoryDto.getBatchNo());
         stockOutRecordDto.setProductModelId(stockUninventoryDto.getProductModelId());
         stockOutRecordDto.setType("1");

--
Gitblit v1.9.3