From d7ffcf478991a8e823448dcc62123743e3d4abfe Mon Sep 17 00:00:00 2001
From: yiwenpeng <ywp303@163.com>
Date: Mon, 11 Sep 2023 13:13:28 +0800
Subject: [PATCH] fix: 历史单据不能重复
---
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java | 2 +-
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java | 5 +++++
src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/service/ShipmentHeaderHistoryServiceImpl.java | 8 ++++++++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java b/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
index ffc66dc..26116fd 100644
--- a/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
+++ b/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
@@ -508,7 +508,7 @@ public class RyTask extends BaseController {
for (ShipmentHeader shipmentHeader : shipmentHeaders) {
try {
- //新增入库单历史
+ //新增出库单历史
shipmentHeaderHistoryService.saveById(String.valueOf(shipmentHeader.getId()), "回传");
shipmentHeader.setDeleted(true);
if (!shipmentHeaderService.updateById(shipmentHeader)) {
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java b/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java
index e29fe4a..01b72b4 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java
@@ -130,6 +130,11 @@ public class ReceiptHeaderHistoryService extends ServiceImpl<ReceiptHeaderHistor
String lastUpdatedBy = receiptHeader.getLastUpdatedBy();
Date lastUpdated = receiptHeader.getLastUpdated();
+ String code = receiptHeader.getCode();
+ List<ReceiptHeaderHistory> list = list(new LambdaQueryWrapper<ReceiptHeaderHistory>().eq(ReceiptHeaderHistory::getCode, code));
+ if (!list.isEmpty()) {
+ return;
+ }
ReceiptHeaderHistory receiptHeaderHistory = new ReceiptHeaderHistory();
BeanUtils.copyProperties(receiptHeader, receiptHeaderHistory);
if (StringUtils.isNotEmpty(name) && "回传".equals(name)) {
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/service/ShipmentHeaderHistoryServiceImpl.java b/src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/service/ShipmentHeaderHistoryServiceImpl.java
index 84227fa..c743c36 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/service/ShipmentHeaderHistoryServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/service/ShipmentHeaderHistoryServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.huaheng.common.exception.service.ServiceException;
import com.huaheng.common.utils.StringUtils;
import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
import com.huaheng.pc.shipment.shipmentDetailHistory.domain.ShipmentDetailHistory;
@@ -52,6 +53,13 @@ public class ShipmentHeaderHistoryServiceImpl extends ServiceImpl<ShipmentHeader
String createdBy = shipmentHeader.getCreatedBy();
String lastUpdatedBy = shipmentHeader.getLastUpdatedBy();
Date lastUpdated = shipmentHeader.getLastUpdated();
+
+ String code = shipmentHeader.getCode();
+ List<ShipmentHeaderHistory> list = list(new LambdaQueryWrapper<ShipmentHeaderHistory>().eq(ShipmentHeaderHistory::getCode, code));
+ if (!list.isEmpty()) {
+ return;
+ }
+
ShipmentHeaderHistory shipmentHeaderHistory = new ShipmentHeaderHistory();
BeanUtils.copyProperties(shipmentHeader, shipmentHeaderHistory);
--
libgit2 0.22.2