From 5f68055fa406892d0552a1e58bc06acb0f2c424d Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Tue, 3 Sep 2024 16:35:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?= =?UTF-8?q?=201.=E4=BF=AE=E5=A4=8D=E5=87=BA=E5=BA=93=E6=97=B6=E7=9A=84bug?= =?UTF-8?q?=EF=BC=8C=E5=BA=93=E4=BD=8D=E9=94=81=E5=AE=9A=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/wms/controller/TaskController.java | 8 ++++---- src/main/resources/application.yml | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/wms/controller/TaskController.java b/src/main/java/com/wms/controller/TaskController.java index fc83d7c..87f5528 100644 --- a/src/main/java/com/wms/controller/TaskController.java +++ b/src/main/java/com/wms/controller/TaskController.java @@ -644,12 +644,12 @@ public class TaskController { if (!Objects.equals(currentVehicle.getVehicleStatus(), VehicleStatus.ON.getCode())) { return TaskOutValidationEnum.ERROR_VEHICLE_STATUS.getErrorMessage(); } - if (!Objects.equals(currentLocation.getIsLock(), 1)) { + if (Objects.equals(currentLocation.getIsLock(), 1)) { return TaskOutValidationEnum.LOCKED_LOCATION.getErrorMessage(); } } else { Location currentLocation = locationService.getOne(new LambdaQueryWrapper().eq(Location::getLocationId, taskOutRequest.getOriginPoint())); - if (!Objects.equals(currentLocation.getIsLock(), 1)) { + if (Objects.equals(currentLocation.getIsLock(), 1)) { return TaskOutValidationEnum.LOCKED_LOCATION.getErrorMessage(); } if (!Objects.equals(currentLocation.getLocationStatus(), LocationStatus.OCCUPY.getCode())) { @@ -947,7 +947,7 @@ public class TaskController { } /** - * 查找所有物料 + * 查找所有任务 */ @PostMapping("/getTasksByPage") @ResponseBody @@ -982,7 +982,7 @@ public class TaskController { } /** - * 根据 + * 根据查询条件查询任务 */ @PostMapping("/getTasks") @ResponseBody diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b7b74f4..2d58f90 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -13,15 +13,15 @@ spring: # password: coder # driver-class-name: com.mysql.cj.jdbc.Driver # 宝开服务器--内网 -# url: jdbc:mysql://192.168.3.254:3306/wms_miniload_bk7?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true -# username: coder -# password: coder -# driver-class-name: com.mysql.cj.jdbc.Driver - # 测试环境 - url: jdbc:mysql://192.168.3.254:3306/wms_miniload_bk7_test?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true + url: jdbc:mysql://192.168.3.254:3306/wms_miniload_bk7?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true username: coder password: coder driver-class-name: com.mysql.cj.jdbc.Driver + # 测试环境 +# url: jdbc:mysql://192.168.3.254:3306/wms_miniload_bk7_test?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true +# username: coder +# password: coder +# driver-class-name: com.mysql.cj.jdbc.Driver # 从库 # slave_1: # url: jdbc:mysql://localhost:3306/wms_miniload_bk7?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true