liangzhou/wms_server_miniload_bk7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新：

Browse Source 
1.修复出库时的bug，库位锁定错误。
This commit is contained in:
梁州 2024-09-03 16:35:48 +08:00
parent 8b658cd2c0
commit 5f68055fa4
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/wms/controller/TaskController.java
View File

@ -644,12 +644,12 @@ public class TaskController {
if (!Objects.equals(currentVehicle.getVehicleStatus(), VehicleStatus.ON.getCode())) { if (!Objects.equals(currentVehicle.getVehicleStatus(), VehicleStatus.ON.getCode())) {
return TaskOutValidationEnum.ERROR_VEHICLE_STATUS.getErrorMessage(); return TaskOutValidationEnum.ERROR_VEHICLE_STATUS.getErrorMessage();
} }
if (!Objects.equals(currentLocation.getIsLock(), 1)) { if (Objects.equals(currentLocation.getIsLock(), 1)) {
return TaskOutValidationEnum.LOCKED_LOCATION.getErrorMessage(); return TaskOutValidationEnum.LOCKED_LOCATION.getErrorMessage();
} }
} else { } else {
Location currentLocation = locationService.getOne(new LambdaQueryWrapper<Location>().eq(Location::getLocationId, taskOutRequest.getOriginPoint())); Location currentLocation = locationService.getOne(new LambdaQueryWrapper<Location>().eq(Location::getLocationId, taskOutRequest.getOriginPoint()));
if (!Objects.equals(currentLocation.getIsLock(), 1)) { if (Objects.equals(currentLocation.getIsLock(), 1)) {
return TaskOutValidationEnum.LOCKED_LOCATION.getErrorMessage(); return TaskOutValidationEnum.LOCKED_LOCATION.getErrorMessage();
} }
if (!Objects.equals(currentLocation.getLocationStatus(), LocationStatus.OCCUPY.getCode())) { if (!Objects.equals(currentLocation.getLocationStatus(), LocationStatus.OCCUPY.getCode())) {
@ -947,7 +947,7 @@ public class TaskController {
} }
/** /**
* 查找所有物料 * 查找所有任务
*/ */
@PostMapping("/getTasksByPage") @PostMapping("/getTasksByPage")
@ResponseBody @ResponseBody
@ -982,7 +982,7 @@ public class TaskController {
} }
/** /**
* 根据 * 根据查询条件查询任务
*/ */
@PostMapping("/getTasks") @PostMapping("/getTasks")
@ResponseBody @ResponseBody

12
src/main/resources/application.yml
View File

@ -13,15 +13,15 @@ spring:
# password: coder # password: coder
# driver-class-name: com.mysql.cj.jdbc.Driver # 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 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 username: coder
password: coder password: coder
driver-class-name: com.mysql.cj.jdbc.Driver 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: # slave_1:
# url: jdbc:mysql://localhost:3306/wms_miniload_bk7?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true # url: jdbc:mysql://localhost:3306/wms_miniload_bk7?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true