From 668e248e84a62c23953e6443fe39746f63a8b4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Fri, 13 Jun 2025 14:40:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=90=8E=E5=B0=86=E7=94=A8?= =?UTF-8?q?=E8=BD=A6=E9=9C=80=E6=B1=82=E7=BC=96=E5=8F=B7=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicledemand/controller/VehicleDemandController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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())