Commit 663e003a7660dd26acda356d5da9c7d80e6bef81
1 parent
23b8c002
修复编译问题
Showing
1 changed file
with
0 additions
and
2 deletions
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 | @@ -561,7 +561,6 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi | ||
| 561 | List<InventoryDetail> removeInventoryList = new ArrayList<>(); | 561 | List<InventoryDetail> removeInventoryList = new ArrayList<>(); |
| 562 | for(InventoryDetail inventoryDetail : inventoryDetailList) { | 562 | for(InventoryDetail inventoryDetail : inventoryDetailList) { |
| 563 | String containerCode = inventoryDetail.getContainerCode(); | 563 | String containerCode = inventoryDetail.getContainerCode(); |
| 564 | - Container container = | ||
| 565 | Container container = containerService.getContainerByCode(containerCode, warehouseCode); | 564 | Container container = containerService.getContainerByCode(containerCode, warehouseCode); |
| 566 | if(container == null) { | 565 | if(container == null) { |
| 567 | return Result.error("没有找到容器，容器号" + containerCode); | 566 | return Result.error("没有找到容器，容器号" + containerCode); |
| @@ -570,7 +569,6 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi | @@ -570,7 +569,6 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi | ||
| 570 | removeInventoryList.add(inventoryDetail); | 569 | removeInventoryList.add(inventoryDetail); |
| 571 | } | 570 | } |
| 572 | } | 571 | } |
| 573 | - return null; | ||
| 574 | List<ReceiptContainerHeader> unCompleteCombineList = | 572 | List<ReceiptContainerHeader> unCompleteCombineList = |
| 575 | receiptContainerHeaderService.getUnCompleteCombineList(); | 573 | receiptContainerHeaderService.getUnCompleteCombineList(); |
| 576 | if(unCompleteCombineList != null && unCompleteCombineList.size() > 0) { | 574 | if(unCompleteCombineList != null && unCompleteCombineList.size() > 0) { |