From 663e003a7660dd26acda356d5da9c7d80e6bef81 Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Fri, 16 Dec 2022 13:51:52 +0800
Subject: [PATCH] 修复编译问题
---
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java | 2 --
1 file changed, 0 insertions(+), 2 deletions(-)
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
index 35b0945..98d4c12 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
@@ -561,7 +561,6 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
List<InventoryDetail> removeInventoryList = new ArrayList<>();
for(InventoryDetail inventoryDetail : inventoryDetailList) {
String containerCode = inventoryDetail.getContainerCode();
- Container container =
Container container = containerService.getContainerByCode(containerCode, warehouseCode);
if(container == null) {
return Result.error("没有找到容器，容器号" + containerCode);
@@ -570,7 +569,6 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
removeInventoryList.add(inventoryDetail);
}
}
- return null;
List<ReceiptContainerHeader> unCompleteCombineList =
receiptContainerHeaderService.getUnCompleteCombineList();
if(unCompleteCombineList != null && unCompleteCombineList.size() > 0) {
--
libgit2 0.22.2