From ba4f2ca4b3ae845d2bd1e92338b948a8f95ffaaa Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 09 六月 2026 15:11:27 +0800
Subject: [PATCH] 修改废品入库类型
---
src/main/java/com/ruoyi/stock/pojo/StockInRecord.java | 2 +-
src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java | 6 +++++-
src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java | 12 ++++++------
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
index 8c2e664..9d188f3 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
@@ -46,7 +46,7 @@
@Schema(description = "棰勮鏁伴噺")
private BigDecimal warnNum;
- @Schema(description = "绫诲瀷 0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
+ @Schema(description = "绫诲瀷 0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴� 2搴熷搧鍏ュ簱")
private String type;
@Schema(description = "鍒涘缓鏃堕棿")
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
index f86c0cb..81e6ae9 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -104,8 +104,8 @@
stockInRecordDto.setQualitity(stockInRecord.getStockInNum());
stockInventoryMapper.updateSubtractStockInventory(stockInRecordDto);
}
- }else if (stockInRecord.getType().equals("1")) {
- String uninventoryType = resolveUninventoryTypeByInRecordType(stockInRecord.getRecordType());
+ }else if (stockInRecord.getType().equals("1") || stockInRecord.getType().equals("2")) {
+ String uninventoryType = resolveUninventoryTypeByInRecordType(stockInRecord.getType());
LambdaQueryWrapper<StockUninventory> eq = new LambdaQueryWrapper<StockUninventory>()
.eq(StockUninventory::getProductModelId, stockInRecord.getProductModelId())
.eq(StockUninventory::getType, uninventoryType);
@@ -278,9 +278,9 @@
} else {
stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
}
- } else if ("1".equals(stockInRecord.getType())) {
+ } else if ("1".equals(stockInRecord.getType()) || "2".equals(stockInRecord.getType())) {
// 涓嶅悎鏍煎叆搴� -> 鍏堟煡搴撳瓨锛屽瓨鍦ㄥ垯鏇存柊锛屼笉瀛樺湪鍒欐柊澧�
- String uninventoryType = resolveUninventoryTypeByInRecordType(stockInRecord.getRecordType());
+ String uninventoryType = resolveUninventoryTypeByInRecordType(stockInRecord.getType());
StockUninventory stockUninventory = getStockUninventory(stockInRecord.getProductModelId(), stockInRecord.getBatchNo(), uninventoryType);
StockUninventoryDto stockUninventoryDto = new StockUninventoryDto();
stockUninventoryDto.setProductModelId(stockInRecord.getProductModelId());
@@ -310,8 +310,8 @@
return items.size();
}
- private String resolveUninventoryTypeByInRecordType(String recordType) {
- if (StockInQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode().equals(recordType)) {
+ private String resolveUninventoryTypeByInRecordType(String stockInType) {
+ if ("2".equals(stockInType)) {
return WASTE_TYPE;
}
return UNQUALIFIED_TYPE;
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 cf4c1a7..bf7f294 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
@@ -86,7 +86,11 @@
stockInRecordDto.setStockInNum(stockUninventoryDto.getQualitity());
stockInRecordDto.setBatchNo(stockUninventoryDto.getBatchNo());
stockInRecordDto.setProductModelId(stockUninventoryDto.getProductModelId());
- stockInRecordDto.setType("1");
+ if (UNQUALIFIED_TYPE.equals(inventoryType)) {
+ stockInRecordDto.setType("1");
+ } else {
+ stockInRecordDto.setType("2");
+ }
stockInRecordDto.setManufacturerId(stockUninventoryDto.getManufacturerId());
stockInRecordDto.setSource(stockUninventoryDto.getSource());
stockInRecordService.add(stockInRecordDto);
--
Gitblit v1.9.3