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/StockInRecordServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
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 a22733e..94f853a 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -121,7 +121,7 @@
public void exportStockInRecord(HttpServletResponse response, StockInRecordDto stockInRecordDto) {
List<StockInRecordExportData> list = stockInRecordMapper.listStockInRecordExportData(stockInRecordDto);
for (StockInRecordExportData stockInRecordExportData : list) {
- if (stockInRecordExportData.getType().equals("0")) {
+ if (!stockInRecordExportData.getType().equals("0")) {
stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockOutQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
}else {
stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockInQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
@@ -163,7 +163,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public int batchApprove(List<Long> ids, Integer approvalStatus,Long warehouseInfoId) {
+ public int batchApprove(List<Long> ids, Integer approvalStatus,Long warehouseInfoId1) {
if (CollectionUtils.isEmpty(ids)) {
throw new BaseException("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
@@ -179,7 +179,6 @@
throw new BaseException("鍙湁寰呭鎵圭姸鎬佺殑璁板綍鎵嶈兘瀹℃壒,鍏ュ簱鎵规:" + stockInRecord.getInboundBatches());
}
stockInRecord.setApprovalStatus(approvalStatus);
- stockInRecord.setWarehouseInfoId(warehouseInfoId);
stockInRecordMapper.updateById(stockInRecord);
// 瀹℃壒閫氳繃鏃讹紝搴撳瓨澧炲姞
if (ReviewStatusEnum.APPROVED.getCode().equals(approvalStatus)) {
@@ -188,7 +187,7 @@
StockInventory stockInventory = getStockInventory(
stockInRecord.getProductModelId(),
stockInRecord.getBatchNo(),
- warehouseInfoId
+ stockInRecord.getWarehouseInfoId()
);
if (!ObjectUtils.isEmpty(stockInventory)) {
if (stockInventory.getLocked().equals( true)&&!stockInRecord.getRecordType().equals(StockInQualifiedRecordTypeEnum.INVENTORY_CHECK_STOCK_IN.getCode())) {
@@ -198,7 +197,7 @@
StockInventoryDto stockInventoryDto = new StockInventoryDto();
stockInventoryDto.setProductModelId(stockInRecord.getProductModelId());
stockInventoryDto.setBatchNo(stockInRecord.getBatchNo());
- stockInventoryDto.setWarehouseInfoId(warehouseInfoId);
+ stockInventoryDto.setWarehouseInfoId(stockInRecord.getWarehouseInfoId());
stockInventoryDto.setQualitity(stockInRecord.getStockInNum());
stockInventoryDto.setRemark(stockInRecord.getRemark());
if (stockInventory == null) {
@@ -207,7 +206,7 @@
setQualitity(stockInRecord.getStockInNum());
setBatchNo(stockInRecord.getBatchNo());
setRemark(stockInRecord.getRemark());
- setWarehouseInfoId(warehouseInfoId);
+ setWarehouseInfoId(stockInRecord.getWarehouseInfoId());
setVersion(1);
}});
} else {
@@ -227,6 +226,7 @@
setQualitity(stockInRecord.getStockInNum());
setBatchNo(stockInRecord.getBatchNo());
setRemark(stockInRecord.getRemark());
+ setWarehouseInfoId(stockInRecord.getWarehouseInfoId());
setVersion(1);
}});
} else {
--
Gitblit v1.9.3