diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/compressed.tracemonkey-pldi-09.pdf b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/compressed.tracemonkey-pldi-09.pdf index 6557018..6b97a07 100644 Binary files a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/compressed.tracemonkey-pldi-09.pdf and b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/static/generic/web/compressed.tracemonkey-pldi-09.pdf differ diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index dc975ae..b25f21d 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -147,7 +147,8 @@ spring: #redis 配置 redis: database: 0 - host: 123.57.206.181 +# host: 123.57.206.181 + host: localhost port: 6379 password: '' #mybatis plus 设置 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 4388c7b..a517b7f 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 @@ -1,6 +1,7 @@ package org.jeecg.modules.tms.carinout.vehicleinout.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -176,6 +177,11 @@ public class VehicleInOutController extends JeecgController handleConfirm(@RequestBody VehicleInOut vehicleInOut) { + if ("3".equals(vehicleInOut.getCurrentStatus())) { + vehicleInOut.setAtaTime(new Date()); + } else if ("4".equals(vehicleInOut.getCurrentStatus())) { + vehicleInOut.setAtdTime(new Date()); + } vehicleInOutService.updateById(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 722d7d0..3688ef1 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,7 +88,7 @@ public class VehicleInOut implements Serializable { @Excel(name = "司机电话", width = 15) @ApiModelProperty(value = "司机电话") private java.lang.String driverTel; - /**当前状态*/ + /**当前状态 创建-0,对接人确认-1,预约入厂-2,审核入库-3,审核出厂-4*/ @Excel(name = "当前状态", width = 15, dicCode = "currentStatus") @Dict(dicCode = "currentStatus") @ApiModelProperty(value = "当前状态") 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 fe031d0..c1760b3 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 @@ -206,4 +206,9 @@ public class DeliveryDemandController extends JeecgController getByVdNo(@RequestParam(name="vdNo",required=true) String vdNo) { + List vdNos = deliveryDemandService.query().eq("vd_no", vdNo).list(); + return Result.OK(vdNos); + } } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/controller/VehicleDemandCountController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/controller/VehicleDemandCountController.java index f8a1693..508061b 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/controller/VehicleDemandCountController.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/controller/VehicleDemandCountController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -174,4 +176,12 @@ public class VehicleDemandCountController extends JeecgController getByVdNo(@RequestParam(name="vdNo",required=true) String vdNo) { + List vdNos = vehicleDemandCountService.query().eq("vd_no", vdNo).list(); + IPage page = new Page<>(1, vdNos.size()); + page.setRecords(vdNos); + page.setTotal(vdNos.size()); + return Result.OK(page); + } } diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml index 5302ff4..c3b1ac0 100644 --- a/jeecg-boot/pom.xml +++ b/jeecg-boot/pom.xml @@ -33,7 +33,7 @@ 11.2.0.3 19.3.0.0 4.0 - 8.0.27 + 8.0.28 5.8.25