From 95531d1d12c17f6c855076c52bbbe74695fec90d Mon Sep 17 00:00:00 2001
From: yiwenpeng <ywp303@163.com>
Date: Mon, 11 Sep 2023 19:49:12 +0800
Subject: [PATCH] fix:如果是合并出库单打印、打印所有合并前出库单的同时,再额外打印一张合并出库单
---
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java | 18 +++++++++---------
src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java | 20 ++++++++++----------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
index 139947e..a6d9177 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
@@ -453,16 +453,16 @@ public class ShipmentHeaderController extends BaseController {
}
}
}
- } else {
- List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getBillCode, shipmentHeader.getCode()));
- if (taskDetails.isEmpty()) {
- throw new ServiceException("未组盘生成任务，无法打印!");
- }
- AjaxResult result = shipmentHeaderService.autoReport(shipmentHeader, taskDetails, "");
- if (result.hasErr()) {
- throw new ServiceException("打印平库出库单失败:" + result.getMsg());
- }
}
+ List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getBillCode, shipmentHeader.getCode()));
+ if (taskDetails.isEmpty()) {
+ throw new ServiceException("未组盘生成任务，无法打印!");
+ }
+ AjaxResult result = shipmentHeaderService.autoReport(shipmentHeader, taskDetails, "");
+ if (result.hasErr()) {
+ throw new ServiceException("打印平库出库单失败:" + result.getMsg());
+ }
+
return AjaxResult.success();
}
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java b/src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
index ba9e8b4..9ac00a7 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
@@ -267,17 +267,17 @@ public class ShipmentHeaderHistoryController extends BaseController {
}
}
}
- } else {
- List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getBillCode, shipmentHeaderHistory.getCode()));
- if (taskDetails.isEmpty()) {
- throw new ServiceException("未组盘生成任务，无法打印!");
- }
- BeanUtils.copyProperties(shipmentHeaderHistory, newShipmentHeader);
- AjaxResult result = shipmentHeaderService.autoReport(newShipmentHeader, taskDetails, "");
- if (result.hasErr()) {
- throw new ServiceException("打印平库出库单失败:" + result.getMsg());
- }
}
+ List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getBillCode, shipmentHeaderHistory.getCode()));
+ if (taskDetails.isEmpty()) {
+ throw new ServiceException("未组盘生成任务，无法打印!");
+ }
+ BeanUtils.copyProperties(shipmentHeaderHistory, newShipmentHeader);
+ AjaxResult result = shipmentHeaderService.autoReport(newShipmentHeader, taskDetails, "");
+ if (result.hasErr()) {
+ throw new ServiceException("打印平库出库单失败:" + result.getMsg());
+ }
+
return AjaxResult.success();
}
--
libgit2 0.22.2