用车需求调整

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 设置

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<VehicleInOut, IVehic
 
 	@PostMapping(value = "/handleConfirm")
 	public Result<String> 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("操作成功！");
 	}

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 = "当前状态")

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<DeliveryDemand, ID
 		 return deliveryDemandService.getPalletsNum(deliveryDemand);
 	 }
 
+	 @GetMapping(value = "/getByVdNo")
+	 public Result<?> getByVdNo(@RequestParam(name="vdNo",required=true) String vdNo) {
+		 List<DeliveryDemand> vdNos = deliveryDemandService.query().eq("vd_no", vdNo).list();
+		 return Result.OK(vdNos);
+	 }
 }

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<VehicleDemandC
         return super.importExcel(request, response, VehicleDemandCount.class);
     }
 
+	 @GetMapping(value = "/getByVdNo")
+	 public Result<?> getByVdNo(@RequestParam(name="vdNo",required=true) String vdNo) {
+		 List<VehicleDemandCount> vdNos = vehicleDemandCountService.query().eq("vd_no", vdNo).list();
+		 IPage<VehicleDemandCount> page = new Page<>(1, vdNos.size());
+		 page.setRecords(vdNos);
+		 page.setTotal(vdNos.size());
+		 return Result.OK(page);
+	 }
 }

jeecg-boot/pom.xml

@@ -33,7 +33,7 @@
 		<ojdbc6.version>11.2.0.3</ojdbc6.version>
 		<ojdbc8.version>19.3.0.0</ojdbc8.version>
 		<sqljdbc4.version>4.0</sqljdbc4.version>
-		<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
+		<mysql-connector-java.version>8.0.28</mysql-connector-java.version>
 		<hutool.version>5.8.25</hutool.version>
 
 		<!-- 持久层 -->