diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java index 5ffc888..3531315 100644 --- a/src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java +++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java @@ -232,10 +232,10 @@ public class ShipmentTaskService { taskDetail.setContainerCode(task.getContainerCode()); - List<InventoryDetail> inventoryDetaillist = inventoryDetailService.list(new LambdaQueryWrapper<InventoryDetail>().eq(InventoryDetail::getContainerCode, task.getContainerCode())); - taskDetail.setElectricQuantity(inventoryDetaillist.get(0).getElectricQuantity()); - taskDetail.setMaterialNetWeight(inventoryDetaillist.get(0).getMaterialNetWeight()); - taskDetail.setBatteryPackTwoCode(inventoryDetaillist.get(0).getBatteryPackTwoCode()); +// List<InventoryDetail> inventoryDetaillist = inventoryDetailService.list(new LambdaQueryWrapper<InventoryDetail>().eq(InventoryDetail::getContainerCode, task.getContainerCode())); + taskDetail.setElectricQuantity(shipmentContainerDetail.getElectricQuantity()); + taskDetail.setMaterialNetWeight(shipmentContainerDetail.getMaterialNetWeight()); + taskDetail.setBatteryPackTwoCode(shipmentContainerDetail.getBatteryPackTwoCode()); taskDetail.setFromLocation(task.getFromLocation()); // taskDetail.setToLocation(task.getToLocation()); taskDetail.setLot(shipmentContainerDetail.getLot());