fix:如果是合并出库单打印、打印所有合并前出库单的同时,再额外打印一张合并出库单

易文鹏
1 parent a56e727c
Showing 2 changed files with 19 additions and 19 deletions
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.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();
     }
  
@@ -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();
     }