diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/controller/VehicleInOutController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/controller/VehicleInOutController.java index d349473..5b5add9 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/controller/VehicleInOutController.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/controller/VehicleInOutController.java @@ -16,6 +16,8 @@ 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.carinout.vehicleinout.entity.VehicleInOut; +import org.jeecg.modules.tms.carinout.vehicleinout.entity.VehicleInOutCount; +import org.jeecg.modules.tms.carinout.vehicleinout.entity.VehicleParam; import org.jeecg.modules.tms.carinout.vehicleinout.service.IVehicleInOutService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -208,4 +210,27 @@ public class VehicleInOutController extends JeecgController getCount() { + VehicleInOutCount vehicleInOutCount = vehicleInOutService.getCount(); + return Result.OK(vehicleInOutCount); + } + + /** + * 获取车辆进出厂明细 + * @return + */ + @GetMapping(value = "/getVehicle") + public Result getVehicle(VehicleParam vehicleParam) { + List vehicleInOuts = vehicleInOutService.getVehicle(vehicleParam); + IPage page = new Page<>(1, vehicleInOuts.size()); + page.setRecords(vehicleInOuts); + page.setTotal(vehicleInOuts.size()); + return Result.OK(page); + } } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/entity/VehicleInOutCount.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/entity/VehicleInOutCount.java new file mode 100644 index 0000000..ea2dbc9 --- /dev/null +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/entity/VehicleInOutCount.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.tms.carinout.vehicleinout.entity; + +import lombok.Data; + +/** + * @Description + * @Author admin + * @Date 2025/5/7 9:42 + */ +@Data +public class VehicleInOutCount { + /** 今日计划入厂数 */ + private Integer planCount; + /** 当前排队数 */ + private Integer lineUpCount; + /** 已入厂 */ + private Integer inCount; + /** 已离厂 */ + private Integer outCount; +} diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/entity/VehicleParam.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/entity/VehicleParam.java new file mode 100644 index 0000000..078c7ec --- /dev/null +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/entity/VehicleParam.java @@ -0,0 +1,23 @@ +package org.jeecg.modules.tms.carinout.vehicleinout.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @Description + * @Author admin + * @Date 2025/5/7 10:54 + */ +@Data +public class VehicleParam { + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date beginDate; + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date endDate; +} diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/VehicleInOutMapper.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/VehicleInOutMapper.java index 96b0bfc..e2765fb 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/VehicleInOutMapper.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/VehicleInOutMapper.java @@ -5,6 +5,8 @@ import java.util.List; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.tms.carinout.vehicleinout.entity.VehicleInOut; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.tms.carinout.vehicleinout.entity.VehicleInOutCount; +import org.jeecg.modules.tms.carinout.vehicleinout.entity.VehicleParam; /** * @Description: 车辆出入厂流程管理报表 @@ -13,5 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Version: V1.0 */ public interface VehicleInOutMapper extends BaseMapper { + VehicleInOutCount getCount(); + List getVehicle(VehicleParam vehicleParam); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/xml/VehicleInOutMapper.xml b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/xml/VehicleInOutMapper.xml index b1c4952..998e6df 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/xml/VehicleInOutMapper.xml +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/xml/VehicleInOutMapper.xml @@ -2,4 +2,25 @@ + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/service/IVehicleInOutService.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/service/IVehicleInOutService.java index 1fbd625..4d1e98f 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/service/IVehicleInOutService.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/service/IVehicleInOutService.java @@ -2,6 +2,10 @@ package org.jeecg.modules.tms.carinout.vehicleinout.service; import org.jeecg.modules.tms.carinout.vehicleinout.entity.VehicleInOut; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.tms.carinout.vehicleinout.entity.VehicleInOutCount; +import org.jeecg.modules.tms.carinout.vehicleinout.entity.VehicleParam; + +import java.util.List; /** * @Description: 车辆出入厂流程管理报表 @@ -11,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IVehicleInOutService extends IService { + VehicleInOutCount getCount(); + + List getVehicle(VehicleParam vehicleParam); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/service/impl/VehicleInOutServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/service/impl/VehicleInOutServiceImpl.java index 575b84c..8bcdc43 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/service/impl/VehicleInOutServiceImpl.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/service/impl/VehicleInOutServiceImpl.java @@ -1,12 +1,17 @@ package org.jeecg.modules.tms.carinout.vehicleinout.service.impl; +import lombok.RequiredArgsConstructor; import org.jeecg.modules.tms.carinout.vehicleinout.entity.VehicleInOut; +import org.jeecg.modules.tms.carinout.vehicleinout.entity.VehicleInOutCount; +import org.jeecg.modules.tms.carinout.vehicleinout.entity.VehicleParam; import org.jeecg.modules.tms.carinout.vehicleinout.mapper.VehicleInOutMapper; import org.jeecg.modules.tms.carinout.vehicleinout.service.IVehicleInOutService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; + /** * @Description: 车辆出入厂流程管理报表 * @Author: jeecg-boot @@ -14,6 +19,17 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @Version: V1.0 */ @Service +@RequiredArgsConstructor public class VehicleInOutServiceImpl extends ServiceImpl implements IVehicleInOutService { + private final VehicleInOutMapper vehicleInOutMapper; + @Override + public VehicleInOutCount getCount() { + return vehicleInOutMapper.getCount(); + } + + @Override + public List getVehicle(VehicleParam vehicleParam) { + return vehicleInOutMapper.getVehicle(vehicleParam); + } } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/controller/DeliveryDemandController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/controller/DeliveryDemandController.java index 4f7b2b2..7ef56eb 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/controller/DeliveryDemandController.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/controller/DeliveryDemandController.java @@ -12,9 +12,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.carinout.vehicleinout.entity.VehicleParam; import org.jeecg.modules.tms.outbound.deliverydemand.entity.DeliveryDemand; import org.jeecg.modules.tms.outbound.deliverydemand.entity.DeliveryDemandDetail; import org.jeecg.modules.tms.outbound.deliverydemand.service.IDeliveryDemandService; @@ -221,4 +223,20 @@ public class DeliveryDemandController extends JeecgController vdNos = deliveryDemandService.query().eq("vd_no", vdNo).list(); return Result.OK(vdNos); } + + /** + * 更具发货时间获取发货计划 + * @param vehicleParam + * @return + */ + @GetMapping(value = "/getDelivery") + public Result getDelivery(VehicleParam vehicleParam) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.ge(DeliveryDemand::getShipDate, vehicleParam.getBeginDate()) + .le(DeliveryDemand::getShipDate, vehicleParam.getEndDate()); + List list = deliveryDemandService.list(lambdaQueryWrapper); + IPage page = new Page<>(1, list.size()); + page.setRecords(list).setTotal(list.size()); + return Result.OK(page); + } }