From ae788be25b880bd97aff70cc77c0838e768af8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Wed, 23 Apr 2025 15:54:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=8A=9F=E8=83=BD=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LogisticsRouteController.java | 22 +++++++++++++++++-- .../TmsVehicleOperatorController.java | 12 ++++++++++ .../controller/VehiclePalletController.java | 17 ++++++++++++++ .../TmsVehicleProductController.java | 5 +++-- .../controller/DeliveryDemandController.java | 10 +++++++++ .../VehicleDemandCountController.java | 5 +++++ 6 files changed, 67 insertions(+), 4 deletions(-) diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/logisticsroute/controller/LogisticsRouteController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/logisticsroute/controller/LogisticsRouteController.java index 95ddb99..02fe811 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/logisticsroute/controller/LogisticsRouteController.java +++ b/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 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 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 getStartCity() { + public Result getCity() { List list = logisticsRouteService.list(); - List strings = list.stream().map(s -> s.getStartCity() + "&-" + s.getTargetCity()).distinct().collect(Collectors.toList()); + List 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 list = logisticsRouteService.list(); + List 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); } } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/vehicleoperator/controller/TmsVehicleOperatorController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/vehicleoperator/controller/TmsVehicleOperatorController.java index 6e34c63..3ccfc1d 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/vehicleoperator/controller/TmsVehicleOperatorController.java +++ b/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 getSupplierCodeName() { + List list = tmsVehicleOperatorService.list(); + List strings = list.stream().map(s -> s.getSupplierCode() + "&-" + s.getSupplierName()) + .distinct().collect(Collectors.toList()); + return Result.OK(strings); + } } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/vehiclepallet/controller/VehiclePalletController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/vehiclepallet/controller/VehiclePalletController.java index 609bc28..2e23905 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/vehiclepallet/controller/VehiclePalletController.java +++ b/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 getCarType() { List cars = vehiclePalletService.getCarType(); return Result.ok(cars); } + + /** + * 拆线呢车型车长 + * @return + */ + @GetMapping(value = "/getCarTypeLong") + public Result getCarTypeLong() { + List list = vehiclePalletService.list(); + List strings = list.stream().map(s -> s.getCarType() + "&-" + s.getCarLong()) + .distinct().collect(Collectors.toList()); + return Result.OK(strings); + } } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/vehicleproduct/controller/TmsVehicleProductController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/vehicleproduct/controller/TmsVehicleProductController.java index dff542e..f1772d1 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/basicdata/vehicleproduct/controller/TmsVehicleProductController.java +++ b/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 getStartCity() { + public Result getPnSpecList() { List list = tmsVehicleProductService.list(); - List strings = list.stream().map(s -> s.getPn() + "&-" + s.getSpec()).distinct().collect(Collectors.toList()); + List strings = list.stream().map(s -> s.getPn() + "&-" + s.getSpec()) + .distinct().collect(Collectors.toList()); return Result.OK(strings); } } 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 c1760b3..4f7b2b2 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 @@ -201,11 +201,21 @@ public class DeliveryDemandController extends JeecgController 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 vdNos = deliveryDemandService.query().eq("vd_no", vdNo).list(); 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 508061b..16bf507 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 @@ -176,6 +176,11 @@ public class VehicleDemandCountController extends JeecgController getByVdNo(@RequestParam(name="vdNo",required=true) String vdNo) { List vdNos = vehicleDemandCountService.query().eq("vd_no", vdNo).list();