From 62f05ffba9ea4d9ac6ee28f0477c68050f785a27 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 16:15:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E8=BD=A6=E9=9C=80=E6=B1=82=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=8F=90=E8=B4=A7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VehicleInOutController.java | 23 +++++++++++++++++++ .../vehicleinout/entity/VehicleInOut.java | 14 +++++++++++ 2 files changed, 37 insertions(+) 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 a517b7f..d349473 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 @@ -10,6 +10,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +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; @@ -185,4 +187,25 @@ public class VehicleInOutController extends JeecgController take(@RequestBody VehicleInOut vehicleInOut) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(VehicleInOut::getVehicleDemandCountId, vehicleInOut.getId()); + List list = vehicleInOutService.list(lambdaQueryWrapper); + if (list != null && list.size() > 0) { + return Result.error("已经进行过提货了！"); + } + vehicleInOut.setVehicleDemandCountId(vehicleInOut.getId()); + vehicleInOut.setId(null) + .setCreateTime(null) + .setCreateBy(null); + vehicleInOutService.save(vehicleInOut); + return Result.OK("提货成功！"); + } } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/entity/VehicleInOut.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/entity/VehicleInOut.java index 3688ef1..d79413e 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/entity/VehicleInOut.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/entity/VehicleInOut.java @@ -88,6 +88,18 @@ public class VehicleInOut implements Serializable { @Excel(name = "司机电话", width = 15) @ApiModelProperty(value = "司机电话") private java.lang.String driverTel; + /**司机身份证*/ + @Excel(name = "司机身份证", width = 15) + @ApiModelProperty(value = "司机身份证") + private java.lang.String driverIdCard; + /**进厂门*/ + @Excel(name = "进厂门", width = 15) + @ApiModelProperty(value = "进厂门") + private java.lang.String enterFactoryDoor; + /**出厂门*/ + @Excel(name = "出厂门", width = 15) + @ApiModelProperty(value = "出厂门") + private java.lang.String exitFactoryDoor; /**当前状态 创建-0,对接人确认-1,预约入厂-2,审核入库-3,审核出厂-4*/ @Excel(name = "当前状态", width = 15, dicCode = "currentStatus") @Dict(dicCode = "currentStatus") @@ -127,4 +139,6 @@ public class VehicleInOut implements Serializable { @Excel(name = "出厂地磅重量", width = 15) @ApiModelProperty(value = "出厂地磅重量") private java.lang.Double exitWeight; + /**用车需求计算id*/ + private java.lang.String vehicleDemandCountId; }