From f45a68c1ba97f149b7a6989b7c46e2973d37986a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Fri, 25 Apr 2025 09:55:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E8=BD=A6=E9=9C=80=E6=B1=82=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=90=8C=E6=AD=A5=20=E5=88=A0=E9=99=A4=E7=94=A8?= =?UTF-8?q?=E8=BD=A6=E8=AE=A1=E7=AE=97=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=8F=91=E8=B4=A7=E9=9C=80=E6=B1=82=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IDeliveryDemandService.java | 2 ++ .../service/impl/DeliveryDemandServiceImpl.java | 10 ++++++++++ .../controller/VehicleDemandController.java | 13 +++++++++++++ .../service/IVehicleDemandCountService.java | 1 + .../service/impl/VehicleDemandCountServiceImpl.java | 8 ++++++++ 5 files changed, 34 insertions(+) diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/IDeliveryDemandService.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/IDeliveryDemandService.java index 039555f..bc4fca8 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/IDeliveryDemandService.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/IDeliveryDemandService.java @@ -17,4 +17,6 @@ public interface IDeliveryDemandService extends IService { Result handleMerge(List ids); Result getPalletsNum(DeliveryDemand deliveryDemand); + + void updateByVdNo(String vdNo); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java index 23e79fc..d580a28 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/service/impl/DeliveryDemandServiceImpl.java @@ -1,6 +1,8 @@ package org.jeecg.modules.tms.outbound.deliverydemand.service.impl; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.RequiredArgsConstructor; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.tms.basicdata.constant.GeneralSequenceConstant; @@ -116,4 +118,12 @@ public class DeliveryDemandServiceImpl extends ServiceImpl lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.eq(DeliveryDemand::getVdNo, vdNo) + .set(DeliveryDemand::getCurrentStatus, '0'); + deliveryDemandMapper.update(new DeliveryDemand(), lambdaUpdateWrapper); + } } 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 d3c7fa3..de00fbc 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 @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.tms.outbound.deliverydemand.service.IDeliveryDemandService; import org.jeecg.modules.tms.outbound.vehicledemand.entity.VehicleDemand; import org.jeecg.modules.tms.outbound.vehicledemand.service.IVehicleDemandService; @@ -20,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.tms.outbound.vehicledemandcount.service.IVehicleDemandCountService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -27,6 +29,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -49,6 +52,10 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class VehicleDemandController extends JeecgController { @Autowired private IVehicleDemandService vehicleDemandService; + @Autowired + private IVehicleDemandCountService vehicleDemandCountService; + @Autowired + private IDeliveryDemandService deliveryDemandService; /** * 分页列表查询 @@ -111,8 +118,14 @@ public class VehicleDemandController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { + VehicleDemand byId = vehicleDemandService.getById(id); + // 删除用车计算中的数据 + vehicleDemandCountService.deleteByVdNo(byId.getVdNo()); + // 更新发货需求数据 + deliveryDemandService.updateByVdNo(byId.getVdNo()); vehicleDemandService.removeById(id); return Result.OK("删除成功!"); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/IVehicleDemandCountService.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/IVehicleDemandCountService.java index 19717bd..d68c7df 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/IVehicleDemandCountService.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/IVehicleDemandCountService.java @@ -14,4 +14,5 @@ import java.util.List; public interface IVehicleDemandCountService extends IService { List getByVdNo(String vdNo); + void deleteByVdNo(String vdNo); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/impl/VehicleDemandCountServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/impl/VehicleDemandCountServiceImpl.java index 133f013..f97f0dc 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/impl/VehicleDemandCountServiceImpl.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/impl/VehicleDemandCountServiceImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.tms.outbound.vehicledemandcount.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.jeecg.modules.tms.outbound.vehicledemandcount.entity.VehicleDemandCount; import org.jeecg.modules.tms.outbound.vehicledemandcount.mapper.VehicleDemandCountMapper; @@ -26,4 +27,11 @@ public class VehicleDemandCountServiceImpl extends ServiceImpl getByVdNo(String vdNo) { return vehicleDemandCountMapper.getByVdNo(vdNo); } + + @Override + public void deleteByVdNo(String vdNo) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(VehicleDemandCount::getVdNo, vdNo); + vehicleDemandCountMapper.delete(lambdaQueryWrapper); + } }