From 886521e9f0f04ff262277a42b0b054b39604a544 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 18:04:20 +0800
Subject: [PATCH] 已入库的反审核之后，需要把对应的销售订单已有的任何操作都回退清除。包括入库、质检、出库、出库、发货、审批。处理原订单的库存数据
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 151 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 109 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 1bd4a41..bd45dd2 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -158,6 +158,8 @@
private final StockInRecordService stockInRecordService;
private final StockOutRecordService stockOutRecordService;
private final StockUtils stockUtils;
+ private final ShipmentApprovalMapper shipmentApprovalMapper;
+
@Autowired
private IApproveProcessService approveProcessService;
@@ -3392,13 +3394,96 @@
// 6. 澶勭悊鍘熻鍗曠殑搴撳瓨鏁版嵁锛堢敓鎴愬弽瀹″嚭鍏ュ簱璁板綍锛�
processOriginalOrderStock(originalSalesLedgerId);
+
+ // 7. 娓呴櫎鍘熻鍗曠殑璐ㄦ璁板綍
+ clearQualityInspectRecords(originalSalesLedgerId);
+
+ // 8. 娓呴櫎鍘熻鍗曠殑鍙戣揣淇℃伅鍜屽彂璐у鎵硅褰�
+ clearShippingAndApprovalRecords(originalSalesLedgerId);
+
+ // 9. 鍙栨秷鍘熻鍗曠浉鍏崇殑瀹℃壒娴佺▼
+ cancelApproveProcesses(originalSalesLedgerId);
+ }
+
+ /**
+ * 娓呴櫎鍘熻鍗曠殑璐ㄦ璁板綍
+ */
+ private void clearQualityInspectRecords(Long originalSalesLedgerId) {
+ // 鍒犻櫎涓庡師璁㈠崟鍏宠仈鐨勮川妫�璁板綍
+ qualityInspectMapper.delete(
+ Wrappers.<QualityInspect>lambdaQuery()
+ .eq(QualityInspect::getPurchaseLedgerId, originalSalesLedgerId)
+ );
+ }
+
+ /**
+ * 娓呴櫎鍘熻鍗曠殑鍙戣揣淇℃伅鍜屽彂璐у鎵硅褰�
+ */
+ private void clearShippingAndApprovalRecords(Long originalSalesLedgerId) {
+ // 1. 鏌ヨ鍘熻鍗曠殑鎵�鏈夊彂璐т俊鎭�
+ List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(
+ Wrappers.<ShippingInfo>lambdaQuery()
+ .eq(ShippingInfo::getSalesLedgerId, originalSalesLedgerId)
+ );
+
+ // 2. 鍒犻櫎鍙戣揣瀹℃壒璁板綍
+ if (!CollectionUtils.isEmpty(shippingInfos)) {
+ List<Long> shippingInfoIds = shippingInfos.stream()
+ .map(ShippingInfo::getId)
+ .collect(Collectors.toList());
+
+ shipmentApprovalMapper.delete(
+ Wrappers.<ShipmentApproval>lambdaQuery()
+ .eq(ShipmentApproval::getSalesLedgerId, originalSalesLedgerId)
+ .or()
+ .in(ShipmentApproval::getShippingInfoId, shippingInfoIds)
+ );
+
+ // 3. 鍒犻櫎鍙戣揣淇℃伅璁板綍
+ shippingInfoMapper.delete(
+ Wrappers.<ShippingInfo>lambdaQuery()
+ .eq(ShippingInfo::getSalesLedgerId, originalSalesLedgerId)
+ );
+ }
+ }
+
+ /**
+ * 鍙栨秷鍘熻鍗曠浉鍏崇殑瀹℃壒娴佺▼
+ */
+ private void cancelApproveProcesses(Long originalSalesLedgerId) {
+ // 鍙栨秷鍏ュ簱瀹℃壒娴佺▼
+ List<ApproveProcess> stockInApproveProcesses = approveProcessService.list(
+ new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveType, ApproveTypeEnum.STOCK_IN.getCode())
+ .like(ApproveProcess::getApproveRemark, "salesStock:" + originalSalesLedgerId + ":")
+ .eq(ApproveProcess::getApproveDelete, 0)
+ );
+
+ for (ApproveProcess process : stockInApproveProcesses) {
+ process.setApproveStatus(3); // 璁剧疆涓哄鎵瑰け璐ョ姸鎬�
+ process.setApproveDelete(1); // 鏍囪涓哄凡鍒犻櫎
+ approveProcessService.updateById(process);
+ }
+
+ // 鍙栨秷鍙戣揣瀹℃壒娴佺▼
+ List<ApproveProcess> deliveryApproveProcesses = approveProcessService.list(
+ new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveType, 7) // 鍙戣揣瀹℃壒绫诲瀷
+ .like(ApproveProcess::getApproveRemark, "{\"ledgerId\":" + originalSalesLedgerId)
+ .eq(ApproveProcess::getApproveDelete, 0)
+ );
+
+ for (ApproveProcess process : deliveryApproveProcesses) {
+ process.setApproveStatus(3); // 璁剧疆涓哄鎵瑰け璐ョ姸鎬�
+ process.setApproveDelete(1); // 鏍囪涓哄凡鍒犻櫎
+ approveProcessService.updateById(process);
+ }
}
/**
* 澶勭悊鍘熻鍗曠殑搴撳瓨鏁版嵁
- * 1. 瀵瑰師璁㈠崟鐨勫叆搴撴暟鎹敓鎴愬弽瀹″嚭搴撹褰曪紙閿�鍞�-鍙嶅鍑哄簱锛�
- * 2. 瀵瑰師璁㈠崟鐨勫嚭搴撴暟鎹敓鎴愬弽瀹″叆搴撹褰曪紙閿�鍞�-鍙嶅鍏ュ簱锛�
- * 3. 鏇存柊搴撳瓨琛ㄦ暟鎹�
+ * 1. 鍒犻櫎鍘熻鍗曠殑鎵�鏈夊叆搴撹褰曪紝骞舵墸鍑忓簱瀛�
+ * 2. 鍒犻櫎鍘熻鍗曠殑鎵�鏈夊嚭搴撹褰曪紝骞跺鍔犲簱瀛�
*/
private void processOriginalOrderStock(Long originalSalesLedgerId) {
// 1. 鏌ヨ鍘熻鍗曠殑鎵�鏈夊叆搴撹褰�
@@ -3407,58 +3492,40 @@
.eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
);
- // 2. 瀵规瘡鏉″叆搴撹褰曠敓鎴愬搴旂殑鍙嶅鍑哄簱璁板綍
+ // 2. 鍒犻櫎鍏ュ簱璁板綍骞舵墸鍑忓簱瀛�
for (StockInRecord stockInRecord : stockInRecords) {
- // 2.1 鍒涘缓鍙嶅鍑哄簱璁板綍
- StockOutRecord stockOutRecord = new StockOutRecord();
- stockOutRecord.setOutboundBatches(OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK")); // 鐢熸垚鍑哄簱鎵规鍙�
- stockOutRecord.setStockOutNum(stockInRecord.getStockInNum()); // 鍑哄簱鏁伴噺绛変簬鍘熷叆搴撴暟閲�
- stockOutRecord.setRecordId(stockInRecord.getId()); // 璁板綍鍘熷叆搴撹褰旾D
- stockOutRecord.setRecordType(StockOutQualifiedRecordTypeEnum.SALE_COUNTER_REVIEW_STOCK_OUT.getCode()); // 璁剧疆涓洪攢鍞弽瀹″嚭搴撶被鍨�
- stockOutRecord.setProductModelId(stockInRecord.getProductModelId()); // 浜у搧瑙勬牸ID
- stockOutRecord.setRemark("閿�鍞�-鍙嶅鍑哄簱"); // 澶囨敞
- stockOutRecord.setType(stockInRecord.getType()); // 绫诲瀷锛堝悎鏍�/涓嶅悎鏍硷級
- stockOutRecord.setSalesLedgerId(stockInRecord.getSalesLedgerId()); // 閿�鍞鍗旾D
- stockOutRecord.setSalesLedgerProductId(stockInRecord.getSalesLedgerProductId()); // 閿�鍞鍗曚骇鍝両D
-
- // 2.2 鎻掑叆鍙嶅鍑哄簱璁板綍
- stockOutRecordMapper.insert(stockOutRecord);
-
- // 2.3 浠庡簱瀛樿〃涓墸鍑忕浉搴旀暟閲�
+ // 浠庡簱瀛樿〃涓墸鍑忕浉搴旀暟閲�
StockInventoryDto stockInventoryDto = new StockInventoryDto();
- stockInventoryDto.setProductModelId(stockOutRecord.getProductModelId());
- stockInventoryDto.setQualitity(stockOutRecord.getStockOutNum());
+ stockInventoryDto.setProductModelId(stockInRecord.getProductModelId());
+ stockInventoryDto.setQualitity(stockInRecord.getStockInNum());
stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
}
- // 3. 鏌ヨ鍘熻鍗曠殑鎵�鏈夊嚭搴撹褰�
+ // 3. 鍒犻櫎鎵�鏈夊叆搴撹褰�
+ stockInRecordMapper.delete(
+ Wrappers.<StockInRecord>lambdaQuery()
+ .eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
+ );
+
+ // 4. 鏌ヨ鍘熻鍗曠殑鎵�鏈夊嚭搴撹褰�
List<StockOutRecord> stockOutRecords = stockOutRecordMapper.selectList(
Wrappers.<StockOutRecord>lambdaQuery()
.eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
);
- // 4. 瀵规瘡鏉″嚭搴撹褰曠敓鎴愬搴旂殑鍙嶅鍏ュ簱璁板綍
+ // 5. 鍒犻櫎鍑哄簱璁板綍骞跺鍔犲簱瀛�
for (StockOutRecord stockOutRecord : stockOutRecords) {
- // 4.1 鍒涘缓鍙嶅鍏ュ簱璁板綍
- StockInRecord stockInRecord = new StockInRecord();
- stockInRecord.setInboundBatches(OrderUtils.countTodayByCreateTime(stockInRecordMapper, "RK")); // 鐢熸垚鍏ュ簱鎵规鍙�
- stockInRecord.setStockInNum(stockOutRecord.getStockOutNum()); // 鍏ュ簱鏁伴噺绛変簬鍘熷嚭搴撴暟閲�
- stockInRecord.setRecordId(stockOutRecord.getId()); // 璁板綍鍘熷嚭搴撹褰旾D
- stockInRecord.setRecordType(StockInQualifiedRecordTypeEnum.SALE_COUNTER_REVIEW_STOCK_IN.getCode()); // 璁剧疆涓洪攢鍞弽瀹″叆搴撶被鍨�
- stockInRecord.setProductModelId(stockOutRecord.getProductModelId()); // 浜у搧瑙勬牸ID
- stockInRecord.setRemark("閿�鍞�-鍙嶅鍏ュ簱"); // 澶囨敞
- stockInRecord.setType(stockOutRecord.getType()); // 绫诲瀷锛堝悎鏍�/涓嶅悎鏍硷級
- stockInRecord.setSalesLedgerId(stockOutRecord.getSalesLedgerId()); // 閿�鍞鍗旾D
- stockInRecord.setSalesLedgerProductId(stockOutRecord.getSalesLedgerProductId()); // 閿�鍞鍗曚骇鍝両D
-
- // 4.2 鎻掑叆鍙嶅鍏ュ簱璁板綍
- stockInRecordMapper.insert(stockInRecord);
-
- // 4.3 鍚戝簱瀛樿〃涓鍔犵浉搴旀暟閲�
+ // 鍚戝簱瀛樿〃涓鍔犵浉搴旀暟閲�
StockInventoryDto stockInventoryDto = new StockInventoryDto();
- stockInventoryDto.setProductModelId(stockInRecord.getProductModelId());
- stockInventoryDto.setQualitity(stockInRecord.getStockInNum());
+ stockInventoryDto.setProductModelId(stockOutRecord.getProductModelId());
+ stockInventoryDto.setQualitity(stockOutRecord.getStockOutNum());
stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
}
+
+ // 6. 鍒犻櫎鎵�鏈夊嚭搴撹褰�
+ stockOutRecordMapper.delete(
+ Wrappers.<StockOutRecord>lambdaQuery()
+ .eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
+ );
}
}
\ No newline at end of file
--
Gitblit v1.9.3