一些功能调整

jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/logisticsroute/controller/LogisticsRouteController.java

@@ -83,6 +83,8 @@ public class LogisticsRouteController extends JeecgController<LogisticsRoute, IL
 	//@RequiresPermissions("org.jeecg.modules.tms:tms_logistics_route:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody LogisticsRoute logisticsRoute) {
+		logisticsRoute.setRoute(logisticsRoute.getStartCity() + "--->" +
+				logisticsRoute.getTargetCity());
 		logisticsRouteService.save(logisticsRoute);
 		return Result.OK("添加成功！");
 	}
@@ -98,6 +100,8 @@ public class LogisticsRouteController extends JeecgController<LogisticsRoute, IL
 	//@RequiresPermissions("org.jeecg.modules.tms:tms_logistics_route:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody LogisticsRoute logisticsRoute) {
+		logisticsRoute.setRoute(logisticsRoute.getStartCity() + "--->" +
+				logisticsRoute.getTargetCity());
 		logisticsRouteService.updateById(logisticsRoute);
 		return Result.OK("编辑成功!");
 	}
@@ -179,9 +183,23 @@ public class LogisticsRouteController extends JeecgController<LogisticsRoute, IL
 	  * @return
 	  */
 	 @GetMapping(value = "/getCity")
-	 public Result<?> getStartCity() {
+	 public Result<?> getCity() {
 		 List<LogisticsRoute> list = logisticsRouteService.list();
-		 List<String> strings = list.stream().map(s -> s.getStartCity() + "&-" + s.getTargetCity()).distinct().collect(Collectors.toList());
+		 List<String> strings = list.stream().map(s -> s.getStartCity() + "&-" + s.getTargetCity())
+				 .distinct().collect(Collectors.toList());
+		 return Result.OK(strings);
+	 }
+
+	 /**
+	  * 查询区域城市
+	  * @return
+	  */
+	 @GetMapping(value = "/getAreaCity")
+	 public Result<?> getAreaCity() {
+		 List<LogisticsRoute> list = logisticsRouteService.list();
+		 List<String> strings = list.stream().map(s -> s.getStartArea() + "&-" + s.getStartCity() + "&-" +
+				 s.getTargetArea() + "&-" + s.getTargetCity() + "&-" + s.getRoute() + "&-" + s.getKilometers())
+				 .distinct().collect(Collectors.toList());
 		 return Result.OK(strings);
 	 }
 }

jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/vehicleoperator/controller/TmsVehicleOperatorController.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 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.basicdata.logisticsroute.entity.LogisticsRoute;
 import org.jeecg.modules.tms.basicdata.vehicleoperator.entity.TmsVehicleOperator;
 import org.jeecg.modules.tms.basicdata.vehicleoperator.service.ITmsVehicleOperatorService;
 
@@ -174,4 +175,15 @@ public class TmsVehicleOperatorController extends JeecgController<TmsVehicleOper
         return super.importExcel(request, response, TmsVehicleOperator.class);
     }
 
+	 /**
+	  * 查询供应商编码名称
+	  * @return
+	  */
+	 @GetMapping(value = "/getSupplierCodeName")
+	 public Result<?> getSupplierCodeName() {
+		 List<TmsVehicleOperator> list = tmsVehicleOperatorService.list();
+		 List<String> strings = list.stream().map(s -> s.getSupplierCode() + "&-" + s.getSupplierName())
+				 .distinct().collect(Collectors.toList());
+		 return Result.OK(strings);
+	 }
 }

jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/vehiclepallet/controller/VehiclePalletController.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 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.basicdata.logisticsroute.entity.LogisticsRoute;
 import org.jeecg.modules.tms.basicdata.vehiclepallet.entity.VehiclePallet;
 import org.jeecg.modules.tms.basicdata.vehiclepallet.service.IVehiclePalletService;
 
@@ -174,9 +175,25 @@ public class VehiclePalletController extends JeecgController<VehiclePallet, IVeh
         return super.importExcel(request, response, VehiclePallet.class);
     }
 
+	 /**
+	  * 查询车型
+	  * @return
+	  */
 	@GetMapping("getCarType")
 	public Result<?> getCarType() {
 		List<String> cars = vehiclePalletService.getCarType();
 		return Result.ok(cars);
 	}
+
+	 /**
+	  * 拆线呢车型车长
+	  * @return
+	  */
+	 @GetMapping(value = "/getCarTypeLong")
+	 public Result<?> getCarTypeLong() {
+		 List<VehiclePallet> list = vehiclePalletService.list();
+		 List<String> strings = list.stream().map(s -> s.getCarType() + "&-" + s.getCarLong())
+				 .distinct().collect(Collectors.toList());
+		 return Result.OK(strings);
+	 }
 }

jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/vehicleproduct/controller/TmsVehicleProductController.java

@@ -176,9 +176,10 @@ public class TmsVehicleProductController extends JeecgController<TmsVehicleProdu
     }
 
 	 @GetMapping(value = "/getPnSpecList")
-	 public Result<?> getStartCity() {
+	 public Result<?> getPnSpecList() {
 		 List<TmsVehicleProduct> list = tmsVehicleProductService.list();
-		 List<String> strings = list.stream().map(s -> s.getPn() + "&-" + s.getSpec()).distinct().collect(Collectors.toList());
+		 List<String> strings = list.stream().map(s -> s.getPn() + "&-" + s.getSpec())
+				 .distinct().collect(Collectors.toList());
 		 return Result.OK(strings);
 	 }
 }

jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/controller/DeliveryDemandController.java

@@ -201,11 +201,21 @@ public class DeliveryDemandController extends JeecgController<DeliveryDemand, ID
     	return deliveryDemandService.handleMerge(ids);
 	}
 
+	 /**
+	  * 根据料号、规格、发货数量计算托盘数
+	  * @param deliveryDemand
+	  * @return
+	  */
 	 @PostMapping("/getPalletsNum")
 	 public Result<?> getPalletsNum(@RequestBody DeliveryDemand deliveryDemand) {
 		 return deliveryDemandService.getPalletsNum(deliveryDemand);
 	 }
 
+	 /**
+	  * 通过用车需求编号查询用车需求物料明细
+	  * @param vdNo
+	  * @return
+	  */
 	 @GetMapping(value = "/getByVdNo")
 	 public Result<?> getByVdNo(@RequestParam(name="vdNo",required=true) String vdNo) {
 		 List<DeliveryDemand> vdNos = deliveryDemandService.query().eq("vd_no", vdNo).list();

jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/controller/VehicleDemandCountController.java

@@ -176,6 +176,11 @@ public class VehicleDemandCountController extends JeecgController<VehicleDemandC
         return super.importExcel(request, response, VehicleDemandCount.class);
     }
 
+	 /**
+	  * 通过用车需求编号查询用车需求计算
+	  * @param vdNo
+	  * @return
+	  */
 	 @GetMapping(value = "/getByVdNo")
 	 public Result<?> getByVdNo(@RequestParam(name="vdNo",required=true) String vdNo) {
 		 List<VehicleDemandCount> vdNos = vehicleDemandCountService.query().eq("vd_no", vdNo).list();