diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java index 266c45e..274f740 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/controller/VehicleDemandController.java @@ -328,9 +328,9 @@ public class VehicleDemandController extends JeecgController handleUnbind(@RequestBody List ids) { List vehicleDemands = vehicleDemandService.listByIds(ids); - List vdNoNews = vehicleDemands.stream() + /*List vdNoNews = vehicleDemands.stream() .map(VehicleDemand::getVdNo) - .collect(Collectors.toList()); + .collect(Collectors.toList());*/ boolean hasEven = vehicleDemands.stream().anyMatch(item -> !TmsConstants.currentStatus_1.equals(item.getCurrentStatus())); if (hasEven) { return Result.error("数据中含有不是已合并需求的数据!"); @@ -343,7 +343,8 @@ public class VehicleDemandController extends JeecgController deliveryDemands = deliveryDemandService.listByIds(deliveryDemandIds); List vehicleDemandList = new ArrayList<>(); deliveryDemands.forEach(item -> { - item.setCurrentStatus(TmsConstants.currentStatus_0); + item.setCurrentStatus(TmsConstants.currentStatus_0) + .setVdNo(null); VehicleDemand vehicleDemand = BeanUtil.toBean(item, VehicleDemand.class); vehicleDemand.setTotalPallets(item.getPalletsNum()) .setPreTotalPallets(item.getPalletsNum())