|
|
@ -515,51 +515,52 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, Z |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void sendToRepository(ZyPlanProcess zyPlanProcess) { |
|
|
|
public void sendToRepository(ZyPlanProcess zyPlanProcess) { |
|
|
|
String planId = zyPlanProcess.getPlanId(); |
|
|
|
// String planId = zyPlanProcess.getPlanId();
|
|
|
|
ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId); |
|
|
|
// ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId);
|
|
|
|
if (ObjectUtils.isEmpty(zyProductPlan)) { |
|
|
|
// if (ObjectUtils.isEmpty(zyProductPlan)) {
|
|
|
|
throw new JeecgBootException("生产计划不存在!"); |
|
|
|
// throw new JeecgBootException("生产计划不存在!");
|
|
|
|
} |
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
List<ZyPlanFabric> fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper<ZyPlanFabric>() |
|
|
|
// List<ZyPlanFabric> fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper<ZyPlanFabric>()
|
|
|
|
.eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId())); |
|
|
|
// .eq(ZyPlanFabric::getPlanId, zyPlanProcess.getPlanId()));
|
|
|
|
List<Delivery> deliveryList4Fabric = new LinkedList<>(); |
|
|
|
// List<Delivery> deliveryList4Fabric = new LinkedList<>();
|
|
|
|
Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> { |
|
|
|
// Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> {
|
|
|
|
Delivery delivery = new Delivery(); |
|
|
|
// Delivery delivery = new Delivery();
|
|
|
|
delivery.setDeliveryReason("0"); |
|
|
|
// delivery.setDeliveryReason("0");
|
|
|
|
delivery.setDeliveryTime(new Date()); |
|
|
|
// delivery.setDeliveryTime(new Date());
|
|
|
|
delivery.setItemType("0"); |
|
|
|
// delivery.setItemType("0");
|
|
|
|
delivery.setAmount(e.getAmount().doubleValue()); |
|
|
|
// delivery.setAmount(e.getAmount().doubleValue());
|
|
|
|
delivery.setCarrierId("admin"); |
|
|
|
// delivery.setCarrierId("admin");
|
|
|
|
delivery.setAdminId("admin"); |
|
|
|
// delivery.setAdminId("admin");
|
|
|
|
delivery.setStorehouseId("TODO"); |
|
|
|
// delivery.setStorehouseId("TODO");
|
|
|
|
ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId()); |
|
|
|
// ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId());
|
|
|
|
if (!ObjectUtils.isEmpty(zyFabric)) { |
|
|
|
// if (!ObjectUtils.isEmpty(zyFabric)) {
|
|
|
|
delivery.setItemCode(zyFabric.getFabricNumber()); |
|
|
|
// delivery.setItemCode(zyFabric.getFabricNumber());
|
|
|
|
} |
|
|
|
// }
|
|
|
|
deliveryList4Fabric.add(delivery); |
|
|
|
// deliveryList4Fabric.add(delivery);
|
|
|
|
}); |
|
|
|
// });
|
|
|
|
iDeliveryService.saveBatch(deliveryList4Fabric); |
|
|
|
// iDeliveryService.saveBatch(deliveryList4Fabric);
|
|
|
|
|
|
|
|
//
|
|
|
|
List<ZyPlanAccessories> accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper<ZyPlanAccessories>() |
|
|
|
// List<ZyPlanAccessories> accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper<ZyPlanAccessories>()
|
|
|
|
.eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId())); |
|
|
|
// .eq(ZyPlanAccessories::getPlanId, zyPlanProcess.getPlanId()));
|
|
|
|
List<Delivery> deliveryList4accessories = new LinkedList<>(); |
|
|
|
// List<Delivery> deliveryList4accessories = new LinkedList<>();
|
|
|
|
Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> { |
|
|
|
// Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> {
|
|
|
|
Delivery delivery2 = new Delivery(); |
|
|
|
// Delivery delivery2 = new Delivery();
|
|
|
|
delivery2.setDeliveryReason("0"); |
|
|
|
// delivery2.setDeliveryReason("0");
|
|
|
|
delivery2.setDeliveryTime(new Date()); |
|
|
|
// delivery2.setDeliveryTime(new Date());
|
|
|
|
delivery2.setItemType("1"); |
|
|
|
// delivery2.setItemType("1");
|
|
|
|
delivery2.setAmount(e.getAmount().doubleValue()); |
|
|
|
// delivery2.setAmount(e.getAmount().doubleValue());
|
|
|
|
delivery2.setCarrierId("admin"); |
|
|
|
// delivery2.setCarrierId("admin");
|
|
|
|
delivery2.setAdminId("admin"); |
|
|
|
// delivery2.setAdminId("admin");
|
|
|
|
delivery2.setStorehouseId("TODO"); |
|
|
|
// delivery2.setStorehouseId("TODO");
|
|
|
|
ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId()); |
|
|
|
// ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId());
|
|
|
|
if (!ObjectUtils.isEmpty(zyAccessories)) { |
|
|
|
// if (!ObjectUtils.isEmpty(zyAccessories)) {
|
|
|
|
delivery2.setItemCode(zyAccessories.getNums()); |
|
|
|
// delivery2.setItemCode(zyAccessories.getNums());
|
|
|
|
} |
|
|
|
// }
|
|
|
|
deliveryList4accessories.add(delivery2); |
|
|
|
// deliveryList4accessories.add(delivery2);
|
|
|
|
}); |
|
|
|
// });
|
|
|
|
iDeliveryService.saveBatch(deliveryList4accessories); |
|
|
|
// iDeliveryService.saveBatch(deliveryList4accessories);
|
|
|
|
|
|
|
|
iDeliveryService.sendToRepository(zyPlanProcess.getPlanId()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|