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 b45687b..436f440 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 @@ -128,7 +128,10 @@ public class VehicleDemandController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { VehicleDemand byId = vehicleDemandService.getById(id); // 删除用车计算中的数据 - vehicleDemandCountService.deleteByVdNo(byId.getVdNo()); + boolean b = vehicleDemandCountService.deleteByVdNo(byId.getVdNo()); + if (!b) { + return Result.error("用车需求计算含有已经审核通过的数据,不能删除!"); + } // 更新发货需求数据 deliveryDemandService.updateByVdNo(byId.getVdNo(), "0"); vehicleDemandService.removeById(id); 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 70a706d..ac9e85d 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,7 +14,7 @@ import java.util.List; public interface IVehicleDemandCountService extends IService { List getByVdNo(String vdNo); - void deleteByVdNo(String vdNo); + boolean deleteByVdNo(String vdNo); List getVdCountById(String id); } 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 4ae6ee5..4478d90 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 @@ -29,10 +29,18 @@ public class VehicleDemandCountServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(VehicleDemandCount::getVdNo, vdNo); - vehicleDemandCountMapper.delete(lambdaQueryWrapper); + lambdaQueryWrapper.eq(VehicleDemandCount::getVdNo, vdNo) + .eq(VehicleDemandCount::getAuditResult, "1"); + List vehicleDemandCounts = vehicleDemandCountMapper.selectList(lambdaQueryWrapper); + if (vehicleDemandCounts != null && vehicleDemandCounts.size() > 0) { + return false; + } + LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper1.eq(VehicleDemandCount::getVdNo, vdNo); + vehicleDemandCountMapper.delete(lambdaQueryWrapper1); + return true; } @Override