diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java index 63b0afe0..bd81fbe7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java @@ -515,51 +515,52 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper() - .eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId())); - List deliveryList4Fabric = new LinkedList<>(); - Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> { - Delivery delivery = new Delivery(); - delivery.setDeliveryReason("0"); - delivery.setDeliveryTime(new Date()); - delivery.setItemType("0"); - delivery.setAmount(e.getAmount().doubleValue()); - delivery.setCarrierId("admin"); - delivery.setAdminId("admin"); - delivery.setStorehouseId("TODO"); - ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId()); - if (!ObjectUtils.isEmpty(zyFabric)) { - delivery.setItemCode(zyFabric.getFabricNumber()); - } - deliveryList4Fabric.add(delivery); - }); - iDeliveryService.saveBatch(deliveryList4Fabric); - - List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper() - .eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId())); - List deliveryList4accessories = new LinkedList<>(); - Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> { - Delivery delivery2 = new Delivery(); - delivery2.setDeliveryReason("0"); - delivery2.setDeliveryTime(new Date()); - delivery2.setItemType("1"); - delivery2.setAmount(e.getAmount().doubleValue()); - delivery2.setCarrierId("admin"); - delivery2.setAdminId("admin"); - delivery2.setStorehouseId("TODO"); - ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId()); - if (!ObjectUtils.isEmpty(zyAccessories)) { - delivery2.setItemCode(zyAccessories.getNums()); - } - deliveryList4accessories.add(delivery2); - }); - iDeliveryService.saveBatch(deliveryList4accessories); +// String planId = zyPlanProcess.getPlanId(); +// ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId); +// if (ObjectUtils.isEmpty(zyProductPlan)) { +// throw new JeecgBootException("生产计划不存在!"); +// } + +// List fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper() +// .eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId())); +// List deliveryList4Fabric = new LinkedList<>(); +// Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> { +// Delivery delivery = new Delivery(); +// delivery.setDeliveryReason("0"); +// delivery.setDeliveryTime(new Date()); +// delivery.setItemType("0"); +// delivery.setAmount(e.getAmount().doubleValue()); +// delivery.setCarrierId("admin"); +// delivery.setAdminId("admin"); +// delivery.setStorehouseId("TODO"); +// ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId()); +// if (!ObjectUtils.isEmpty(zyFabric)) { +// delivery.setItemCode(zyFabric.getFabricNumber()); +// } +// deliveryList4Fabric.add(delivery); +// }); +// iDeliveryService.saveBatch(deliveryList4Fabric); +// +// List accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper() +// .eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId())); +// List deliveryList4accessories = new LinkedList<>(); +// Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> { +// Delivery delivery2 = new Delivery(); +// delivery2.setDeliveryReason("0"); +// delivery2.setDeliveryTime(new Date()); +// delivery2.setItemType("1"); +// delivery2.setAmount(e.getAmount().doubleValue()); +// delivery2.setCarrierId("admin"); +// delivery2.setAdminId("admin"); +// delivery2.setStorehouseId("TODO"); +// ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId()); +// if (!ObjectUtils.isEmpty(zyAccessories)) { +// delivery2.setItemCode(zyAccessories.getNums()); +// } +// deliveryList4accessories.add(delivery2); +// }); +// iDeliveryService.saveBatch(deliveryList4accessories); + iDeliveryService.sendToRepository(zyPlanProcess.getPlanId()); }