From 47806d9e390ee00e1d29ad1da8c1aa908882a758 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:43:59 +0800
Subject: [PATCH] 用河南鹤壁代码覆盖山西长治
---
src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java | 40 +++++++---------------------------------
1 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
index 7138641..b73f8b2 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
@@ -15,8 +15,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-
-import java.time.LocalDateTime;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.dto.StockOutRecordDto;
import com.ruoyi.stock.dto.StockUninventoryDto;
@@ -59,18 +57,14 @@
}
@Override
- public int add(StockOutRecordDto stockOutRecordDto) {
- LocalDateTime createTime = stockOutRecordDto.getCreateTime();
- if (createTime == null) {
- createTime = LocalDateTime.now();
- }
- String no = OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK","outbound_batches", createTime);
+ public StockOutRecordDto add(StockOutRecordDto stockOutRecordDto) {
+ String no = OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK","outbound_batches");
stockOutRecordDto.setOutboundBatches(no);
- stockOutRecordDto.setCreateTime(createTime);
if (StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode().equals(stockOutRecordDto.getRecordType())){
stockOutRecordDto.setApprovalStatus(3);
}
- return stockOutRecordMapper.insert(stockOutRecordDto);
+ stockOutRecordMapper.insert(stockOutRecordDto);
+ return stockOutRecordDto;
}
@Override
@@ -180,9 +174,9 @@
if (stockOutRecord == null) {
throw new BaseException("鍑哄簱璁板綍涓嶅瓨鍦�,鏃犳硶瀹℃壒!!!");
}
- if (stockOutRecord.getApprovalStatus() != null && !ReviewStatusEnum.PENDING_REVIEW.getCode().equals(stockOutRecord.getApprovalStatus())) {
- throw new BaseException("鍙湁寰呭鎵圭姸鎬佺殑璁板綍鎵嶈兘瀹℃壒,鍑哄簱鎵规:" + stockOutRecord.getOutboundBatches());
- }
+ //if (stockOutRecord.getApprovalStatus() != null && !ReviewStatusEnum.PENDING_REVIEW.getCode().equals(stockOutRecord.getApprovalStatus())) {
+ // throw new BaseException("鍙湁寰呭鎵圭姸鎬佺殑璁板綍鎵嶈兘瀹℃壒,鍑哄簱鎵规:" + stockOutRecord.getOutboundBatches());
+ //}
stockOutRecord.setApprovalStatus(approvalStatus);
stockOutRecordMapper.updateById(stockOutRecord);
// 瀹℃壒閫氳繃鏃讹紝鎵ｅ噺搴撳瓨
@@ -211,26 +205,6 @@
stockUninventoryMapper.updateSubtractStockUnInventory(stockUninventoryDto);
}
}
- }
- return ids.size();
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int batchReAudit(List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) {
- throw new BaseException("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
- }
- for (Long id : ids) {
- StockOutRecord stockOutRecord = stockOutRecordMapper.selectById(id);
- if (stockOutRecord == null) {
- throw new BaseException("鍑哄簱璁板綍涓嶅瓨鍦�,鏃犳硶閲嶆柊瀹℃牳!!!");
- }
- if (!ReviewStatusEnum.REJECTED.getCode().equals(stockOutRecord.getApprovalStatus())) {
- throw new BaseException("鍙湁椹冲洖鐘舵�佺殑璁板綍鎵嶈兘閲嶆柊瀹℃牳,鍑哄簱鎵规:" + stockOutRecord.getOutboundBatches());
- }
- stockOutRecord.setApprovalStatus(ReviewStatusEnum.PENDING_REVIEW.getCode());
- stockOutRecordMapper.updateById(stockOutRecord);
}
return ids.size();
}
--
Gitblit v1.9.3