From 741918a903e17b2ec7522556d2c043b8d35dd8a1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 15 六月 2026 17:42:58 +0800
Subject: [PATCH] 生产取消bom,不合格管理定制化
---
src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java | 61 ------------------------------
1 files changed, 0 insertions(+), 61 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 61aac8b..6428453 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -19,8 +19,6 @@
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.dto.StockUninventoryDto;
import com.ruoyi.stock.execl.StockInRecordExportData;
-import com.ruoyi.production.mapper.ProductionOrderPickMapper;
-import com.ruoyi.production.pojo.ProductionOrderPick;
import com.ruoyi.stock.mapper.StockInRecordMapper;
import com.ruoyi.stock.mapper.StockInventoryMapper;
import com.ruoyi.stock.mapper.StockUninventoryMapper;
@@ -44,7 +42,6 @@
private StockInRecordMapper stockInRecordMapper;
private StockInventoryMapper stockInventoryMapper;
private StockUninventoryMapper stockUninventoryMapper;
- private ProductionOrderPickMapper productionOrderPickMapper;
@Override
public IPage<StockInRecordDto> listPage(Page page, StockInRecordDto stockInRecordDto) {
@@ -158,32 +155,6 @@
return stockUninventoryMapper.selectOne(eq);
}
- /**
- * 鍥炴粴鐢熶骇閫�鏂欏叆搴撶殑棰嗘枡璁板綍閫�鏂欐暟閲�
- * @param stockInRecord 鍏ュ簱璁板綍
- */
- private void rollbackFeedReturnQty(StockInRecord stockInRecord) {
- ProductionOrderPick productionOrderPick = productionOrderPickMapper.selectById(stockInRecord.getRecordId());
- if (productionOrderPick != null) {
- BigDecimal returnQty = productionOrderPick.getReturnQty();
- if (returnQty == null) {
- returnQty = BigDecimal.ZERO;
- }
- BigDecimal newReturnQty = returnQty.subtract(stockInRecord.getStockInNum());
- if (newReturnQty.compareTo(BigDecimal.ZERO) < 0) {
- newReturnQty = BigDecimal.ZERO;
- }
- productionOrderPick.setReturnQty(newReturnQty);
- // 閲嶆柊璁＄畻瀹為檯鐢ㄩ噺
- BigDecimal actualQty = productionOrderPick.getQuantity().add(
- productionOrderPick.getFeedingQty() != null ? productionOrderPick.getFeedingQty() : BigDecimal.ZERO)
- .subtract(newReturnQty);
- productionOrderPick.setActualQty(actualQty);
- productionOrderPick.setReturned(newReturnQty.compareTo(BigDecimal.ZERO) > 0);
- productionOrderPickMapper.updateById(productionOrderPick);
- }
- }
-
@Override
@Transactional(rollbackFor = Exception.class)
public int batchDeletePending(List<Long> ids) {
@@ -194,11 +165,6 @@
}
if (stockInRecord.getApprovalStatus() != null && !ReviewStatusEnum.PENDING_REVIEW.getCode().equals(stockInRecord.getApprovalStatus())) {
throw new BaseException("鍙湁寰呭鎵圭姸鎬佺殑璁板綍鎵嶈兘鍒犻櫎,鍏ュ簱鎵规:" + stockInRecord.getInboundBatches());
- }
-
- // 濡傛灉鏄敓浜ч��鏂欏叆搴擄紝鍒犻櫎鏃堕渶瑕佸洖婊氶鏂欒褰曠殑閫�鏂欐暟閲�
- if (StockInQualifiedRecordTypeEnum.FEED_RETURN_IN.getCode().equals(stockInRecord.getRecordType())) {
- rollbackFeedReturnQty(stockInRecord);
}
}
return stockInRecordMapper.deleteBatchIds(ids);
@@ -223,12 +189,6 @@
}
stockInRecord.setApprovalStatus(approvalStatus);
stockInRecordMapper.updateById(stockInRecord);
-
- // 瀹℃壒椹冲洖鏃讹紝濡傛灉鏄敓浜ч��鏂欏叆搴擄紝闇�瑕佸洖婊氶鏂欒褰曠殑閫�鏂欐暟閲�
- if (ReviewStatusEnum.REJECTED.getCode().equals(approvalStatus) &&
- StockInQualifiedRecordTypeEnum.FEED_RETURN_IN.getCode().equals(stockInRecord.getRecordType())) {
- rollbackFeedReturnQty(stockInRecord);
- }
// 瀹℃壒閫氳繃鏃讹紝搴撳瓨澧炲姞
if (ReviewStatusEnum.APPROVED.getCode().equals(approvalStatus)) {
@@ -292,27 +252,6 @@
// 鍙湁椹冲洖鐘舵�佹墠鑳介噸鏂板鏍�
if (!ReviewStatusEnum.REJECTED.getCode().equals(stockInRecord.getApprovalStatus())) {
throw new BaseException("鍙湁椹冲洖鐘舵�佺殑璁板綍鎵嶈兘閲嶆柊瀹℃牳,鍏ュ簱鎵规:" + stockInRecord.getInboundBatches());
- }
-
- // 濡傛灉鏄敓浜ч��鏂欏叆搴擄紝鎭㈠閫�鏂欐暟閲忥紙鍥犱负椹冲洖鏃跺凡鎵ｅ噺锛�
- if (StockInQualifiedRecordTypeEnum.FEED_RETURN_IN.getCode().equals(stockInRecord.getRecordType())) {
- ProductionOrderPick productionOrderPick = productionOrderPickMapper.selectById(stockInRecord.getRecordId());
- if (productionOrderPick != null) {
- BigDecimal returnQty = productionOrderPick.getReturnQty();
- if (returnQty == null) {
- returnQty = BigDecimal.ZERO;
- }
- // 閲嶆柊瀹℃牳鏃舵仮澶嶉��鏂欐暟閲�
- BigDecimal newReturnQty = returnQty.add(stockInRecord.getStockInNum());
- productionOrderPick.setReturnQty(newReturnQty);
- // 閲嶆柊璁＄畻瀹為檯鐢ㄩ噺
- BigDecimal actualQty = productionOrderPick.getQuantity().add(
- productionOrderPick.getFeedingQty() != null ? productionOrderPick.getFeedingQty() : BigDecimal.ZERO)
- .subtract(newReturnQty);
- productionOrderPick.setActualQty(actualQty);
- productionOrderPick.setReturned(newReturnQty.compareTo(BigDecimal.ZERO) > 0);
- productionOrderPickMapper.updateById(productionOrderPick);
- }
}
// 灏嗙姸鎬佹敼涓哄緟瀹℃牳
--
Gitblit v1.9.3