diff --git a/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java b/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java
index 640b405..6e45ffd 100644
--- a/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java
+++ b/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java
@@ -87,14 +87,11 @@ public class OverrideHandleServiceImpl implements OverrideHandleService {
@Override
@Transactional
public AjaxResult OverrideHandle(TaskFinishDomain taskFinishDomain) {
-
String taskNo = taskFinishDomain.getTaskNo();
-
//1、判断非空字段
if (StringUtils.isEmpty(taskNo)) {
return AjaxResult.error("任务号为空");
}
-
//2、根据任务号查找任务
TaskHeader taskHeader = taskHeaderService.getById(taskNo);
if (taskHeader == null) {
@@ -105,45 +102,20 @@ public class OverrideHandleServiceImpl implements OverrideHandleService {
if (status == QuantityConstant.TASK_STATUS_COMPLETED) {
return AjaxResult.error("任务已完成");
}
-
//3、修改任务目的库位，修改入库组盘的库位，修改库位状态
//修改原来目的库位的状态
- LambdaQueryWrapper<Location> locationLam = Wrappers.lambdaQuery();
- locationLam.eq(Location::getCode, taskHeader.getToLocation())
- .eq(Location::getWarehouseCode, warehouseCode);
- Location location = locationService.getOne(locationLam);
+ Location location = locationService.getLocationByCode(taskHeader.getToLocation());
if (location == null) {
return AjaxResult.error("此任务的原目的库位在系统中不存在");
}
- /**
- * 重入的库位由wms提供
- */
- String newLocationCode = null;
+ String newLocationCode;
//重入的库位由wms提供
//查询任务明细
- String value = configService.getKey(QuantityConstant.RULE_ALLOCATION);
- if (StringUtils.isEmpty(value)) {
- return AjaxResult.error("未绑定定位规则");
- }
- int allocationRule = Integer.parseInt(value);
- List<String> locationTypeCodeList = new ArrayList<>();
- String locationType = location.getLocationType();
- if (StringUtils.isNotEmpty(locationType)) {
- locationTypeCodeList.add(locationType);
- }
int high = location.getHigh();
String area = location.getArea();
String roadWay = location.getRoadway();
- List<String> roadWays = new ArrayList<>();
- roadWays.add(roadWay);
String containerCode = taskHeader.getContainerCode();
List<TaskDetail> taskDetailList = taskDetailService.findByTaskId(taskHeader.getId());
- String materialAreaCode = null;
- if (taskDetailList != null && taskDetailList.size() > 0) {
- String materialCode = taskDetailList.get(0).getMaterialCode();
- Material material = materialService.getMaterialByCode(materialCode, warehouseCode);
- materialAreaCode = material.getMaterialAreaCode();
- }
//是空托盘任务，值为1
int taskType = taskHeader.getTaskType();
int onlyEmptyContainer = 0;
@@ -164,7 +136,7 @@ public class OverrideHandleServiceImpl implements OverrideHandleService {
int isSelfCreated = 0;
//是否自建单据库位
- if (!taskDetailList.isEmpty()) {
+ if (taskDetailList != null && !taskDetailList.isEmpty()) {
String materialCode = taskDetailList.get(0).getMaterialCode();
Material material = materialService.getMaterialByCode(materialCode, "CS0001");
if (material == null) {
@@ -175,34 +147,32 @@ public class OverrideHandleServiceImpl implements OverrideHandleService {
}
}
- String locationCode = locationAllocationService.allocation(allocationRule,
- locationTypeCodeList, high, area, roadWays, warehouseCode, containerCode,
- materialAreaCode, frequencyLocation, onlyEmptyContainer, isSelfCreated, isFlammable);
+ String locationCode = locationAllocationService.allocation(high, area, roadWay, containerCode, frequencyLocation, onlyEmptyContainer, isSelfCreated, isFlammable);
if (StringUtils.isEmpty(locationCode)) {
return AjaxResult.error("没有库位可分配");
}
- if (taskType == QuantityConstant.TASK_TYPE_WHOLERECEIPT ||
- taskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) {
+ //入库
+ if (taskType == QuantityConstant.TASK_TYPE_WHOLERECEIPT || taskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) {
//查询入库组盘明细
List<ReceiptContainerDetail> receiptContainerDetailList = new ArrayList<>();
if (taskDetailList != null) {
for (TaskDetail taskDetail : taskDetailList) {
- receiptContainerDetailList.add(receiptContainerDetailService.
- getById(taskDetail.getAllocationId()));
+ receiptContainerDetailList.add(receiptContainerDetailService.getById(taskDetail.getAllocationId()));
}
}
ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(receiptContainerDetailList.get(0).getReceiptContainerId());
LambdaUpdateWrapper<ReceiptContainerDetail> wrapper = Wrappers.lambdaUpdate();
- wrapper.set(ReceiptContainerDetail::getLocationCode, locationCode)
- .in(ReceiptContainerDetail::getId, receiptContainerDetailList.stream().map(ReceiptContainerDetail::getId).collect(Collectors.toList()));
+ wrapper
+ .set(ReceiptContainerDetail::getLocationCode, locationCode)
+ .in(ReceiptContainerDetail::getId, receiptContainerDetailList.stream()
+ .map(ReceiptContainerDetail::getId).collect(Collectors.toList()));
receiptContainerDetailService.update(wrapper);
receiptContainerHeader.setToLocation(locationCode);
receiptContainerHeaderService.updateById(receiptContainerHeader);
}
newLocationCode = locationCode;
-
if (StringUtils.isEmpty(newLocationCode)) {
return AjaxResult.error("没有库位可以分配");
}
@@ -222,12 +192,9 @@ public class OverrideHandleServiceImpl implements OverrideHandleService {
}
//修改子任务
- LambdaQueryWrapper<TaskDetail> taskDetailLam = Wrappers.lambdaQuery();
- taskDetailLam.eq(TaskDetail::getWarehouseCode, warehouseCode)
- .eq(TaskDetail::getTaskId, taskHeader.getId());
- List<TaskDetail> taskDetails = taskDetailService.list(taskDetailLam);
+ List<TaskDetail> taskDetails = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.getId()));
taskDetailList = new ArrayList<>();
- if (taskDetails != null && taskDetails.size() > 0) {
+ if (taskDetails != null && !taskDetails.isEmpty()) {
for (TaskDetail taskDetail : taskDetails) {
taskDetail.setToLocation(newLocationCode);
taskDetailList.add(taskDetail);
diff --git a/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java b/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java
index b4eb8d0..cd31216 100644
--- a/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java
+++ b/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java
@@ -149,14 +149,16 @@ public class TaskAssignServiceImpl implements TaskAssignService {
if (rowFlag == QuantityConstant.ROW_OUT) {
Location insideLocation = locationService.getInsideNear(location);
String insideLocationCode = insideLocation.getCode();
+
+ //判断浅库位上是否有托盘，有托盘就要移库
if (StringUtils.isNotEmpty(insideLocation.getContainerCode())) {
- TaskHeader taskHeader2 = taskHeaderService.getOne(new LambdaQueryWrapper<TaskHeader>().eq(TaskHeader::getFromLocation, insideLocationCode).lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED));
+ //获取是否有未完成的任务
+ TaskHeader taskHeader2 = taskHeaderService.getUndoneTaskByFromLocationCode(insideLocationCode);
if (taskHeader2 != null) {
preTaskNo = taskHeader2.getId();
} else {
- Location destinationLocation = null;
+ Location destinationLocation;
if (insideLocation.getRoadway().equals("5")) {
- //分配库位
//是否自建单据库位
int isSelfCreated = 0;
if (insideLocation.getSelfCreated()) {
@@ -166,6 +168,7 @@ public class TaskAssignServiceImpl implements TaskAssignService {
if (insideLocation.getILayer() > 3) {
isFlammable = false;
}
+ //分配库位
String destinationLocationCode = locationAllocationService.allocation(insideLocation.getHigh(), insideLocation.getArea(), "5",
containerCode, insideLocation.getFrequencyLocation(), insideLocation.getOnlyEmptyContainer(), isSelfCreated, isFlammable);
if (StringUtils.isEmpty(destinationLocationCode)) {
@@ -173,11 +176,6 @@ public class TaskAssignServiceImpl implements TaskAssignService {
} else if (destinationLocationCode.length() > 10) {
return AjaxResult.error(destinationLocationCode);
}
- //锁定库位
- int updateCount2 = locationService.updateStatusNew(destinationLocationCode, warehouseCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY);
- if (updateCount2 != 1) {
- throw new ServiceException("库位已经锁定，不允许再分到这个库位");
- }
destinationLocation = locationService.getLocationByCode(destinationLocationCode);
} else {
//获取一个最近的空闲库位（优先找外侧）
@@ -196,23 +194,16 @@ public class TaskAssignServiceImpl implements TaskAssignService {
return AjaxResult.error("先执行移库任务");
}
} else {
- LambdaQueryWrapper<TaskHeader> lambdaWrapper = Wrappers.lambdaQuery();
- lambdaWrapper.eq(TaskHeader::getToLocation, insideLocationCode);
- lambdaWrapper.lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
- TaskHeader taskHeader1 = taskHeaderService.getOne(lambdaWrapper);
- if (taskHeader1 != null) {
- return AjaxResult.error("执行外侧库位出库时，相应的内侧库位有任务，请先执行完内侧库位任务");
+ //获取是否有未完成的任务
+ if (taskHeaderService.getUndoneTaskByToLocationCode(insideLocationCode) != null) {
+ return AjaxResult.error("执行外侧库位出库时，相应的内侧库位有任务，请先执行完内侧库位任务，库位：" + insideLocationCode);
}
}
taskHeader.setPreTaskNo(preTaskNo);
taskHeaderService.updateById(taskHeader);
}
-
}
-
-
- AjaxResult ajaxResult = sendToWcs(taskHeader, preTaskNo, location);
- return ajaxResult;
+ return sendToWcs(taskHeader, preTaskNo, location);
}
@Override
diff --git a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
index 4fc84e9..6d3c4fa 100644
--- a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
+++ b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
@@ -23,6 +23,8 @@ import org.springframework.stereotype.Service;
import org.springframework.util.StopWatch;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -136,7 +138,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService
for (Location temporaryLocation : setTemporaryTypeList) {
if (temporaryLocation != null) {
- temporaryLocation.setTemporaryType(prefix + location.getCode());
+ temporaryLocation.setTemporaryType(prefix + location.getCode() + "-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HH:mm:ss")));
locationService.updateById(temporaryLocation);
}
}
diff --git a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
index c9c99e9..dbd1dc1 100644
--- a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
+++ b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
@@ -262,11 +262,6 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService
} else if (destinationLocationCode.length() > 10) {
return AjaxResult.error(destinationLocationCode);
}
- //锁定库位
- int updateCount2 = locationService.updateStatusNew(destinationLocationCode, warehouseCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY);
- if (updateCount2 != 1) {
- throw new ServiceException("库位已经锁定，不允许再分到这个库位");
- }
destinationLocation = locationService.getLocationByCode(destinationLocationCode);
} else {
//获取一个最近的空闲库位（优先找外侧）
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
index 2ac77a6..89e77a8 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
@@ -324,22 +324,22 @@ public class InventoryHeaderController extends BaseController {
return prefix + "/transfer";
}
- /**
- * 移库
- */
- @RequiresPermissions("inventory:inventoryHeader:transfer")
- @PostMapping("/transfer")
- @ResponseBody
- public AjaxResult transfer(String sourceLocation, String destinationLocation) {
- if (StringUtils.isEmpty(sourceLocation) || StringUtils.isEmpty(destinationLocation)) {
- throw new ServiceException("源库位和目标库位不能有空值！");
- }
- Location location = locationService.getLocationByCode(destinationLocation);
- if (location.getSelfCreated() || location.getOnlyEmptyContainer() == 1) {
- throw new ServiceException("空托盘库位和自建库位不能移库");
- }
- return inventoryHeaderService.createTransferTask(sourceLocation, destinationLocation);
- }
+ ///**
+ // * 移库
+ // */
+ //@RequiresPermissions("inventory:inventoryHeader:transfer")
+ //@PostMapping("/transfer")
+ //@ResponseBody
+ //public AjaxResult transfer(String sourceLocation, String destinationLocation) {
+ // if (StringUtils.isEmpty(sourceLocation) || StringUtils.isEmpty(destinationLocation)) {
+ // throw new ServiceException("源库位和目标库位不能有空值！");
+ // }
+ // Location location = locationService.getLocationByCode(destinationLocation);
+ // if (location.getSelfCreated() || location.getOnlyEmptyContainer() == 1) {
+ // throw new ServiceException("空托盘库位和自建库位不能移库");
+ // }
+ // return inventoryHeaderService.createTransferTask(sourceLocation, destinationLocation);
+ //}
/**
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java
index 9d5b008..8b9705b 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java
@@ -15,7 +15,7 @@ public interface InventoryHeaderService extends IService<InventoryHeader> {
AjaxResult createCheckOutTask(List<Integer> ids, String port);
- AjaxResult createTransferTask(String sourceLocation, String destinationLocation);
+ //AjaxResult createTransferTask(String sourceLocation, String destinationLocation);
//移库查询入库组盘
int getUncompleteReceiptContainer(String locationCode);
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
index 9c8a299..fb61fee 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
@@ -107,10 +107,10 @@ public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMappe
/**
* 生成移库任务
*/
- @Override
- public AjaxResult createTransferTask(String sourceLocation, String destinationLocation) {
- return transferTaskService.createTransferTask(sourceLocation, destinationLocation, ShiroUtils.getWarehouseCode());
- }
+ //@Override
+ //public AjaxResult createTransferTask(String sourceLocation, String destinationLocation) {
+ // return transferTaskService.createTransferTask(sourceLocation, destinationLocation, ShiroUtils.getWarehouseCode());
+ //}
/**
* 出库查看
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
index 76b9481..b07cd51 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
@@ -72,4 +72,9 @@ public interface TaskHeaderService extends IService<TaskHeader> {
TaskHeader getTaskHeaderByLocation(String locationCode);
+ TaskHeader getUndoneTaskByToLocationCode(String locationCode);
+
+ TaskHeader getUndoneTaskByFromLocationCode(String locationCode);
+
+
}
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
index 4a6ec2a..b8269c3 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -949,4 +949,24 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
return true;
}
+
+
+ //根据来源库位号获取未完成的任务
+ @Override
+ public TaskHeader getUndoneTaskByFromLocationCode(String locationCode) {
+ return taskHeaderService.getOne(new LambdaQueryWrapper<TaskHeader>()
+ .eq(TaskHeader::getFromLocation, locationCode)
+ .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED));
+
+ }
+
+ //根据目标库位号获取未完成的任务
+ @Override
+ public TaskHeader getUndoneTaskByToLocationCode(String locationCode) {
+ return taskHeaderService.getOne(new LambdaQueryWrapper<TaskHeader>()
+ .eq(TaskHeader::getToLocation, locationCode)
+ .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED));
+
+ }
+
}
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/TransferTaskService.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/TransferTaskService.java
index f32f6d1..e9264c6 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/TransferTaskService.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/TransferTaskService.java
@@ -66,45 +66,45 @@ public class TransferTaskService {
Location desLocation = locationService.getLocationByCode(desLocationCode, warehouseCode);
Integer preTaskNo = 0;
if (StringUtils.isNull(sourceLocation)) {
- return AjaxResult.error("源库位：" + sourceLocation.getCode() + "未找到");
+ throw new ServiceException("源库位：" + sourceLocation.getCode() + "未找到");
}
if (!QuantityConstant.STATUS_LOCATION_EMPTY.equals(sourceLocation.getStatus())) {
- return AjaxResult.error("源库位：" + sourceLocation.getCode() + "状态非空闲");
+ throw new ServiceException("源库位：" + sourceLocation.getCode() + "状态非空闲");
}
if (StringUtils.isEmpty(sourceLocation.getContainerCode())) {
- return AjaxResult.error("源库位：" + sourceLocation.getCode() + "不存在托盘");
+ throw new ServiceException("源库位：" + sourceLocation.getCode() + "不存在托盘");
}
//这里增加组盘校验，如果此托盘存在未完成的组盘数据，则不能移库
//校验入库组盘
if (inventoryHeaderService.getUncompleteReceiptContainer(sourceLocationCode, warehouseCode) > 0) {
- return AjaxResult.error("源库位：" + sourceLocation.getCode() + "存在入库组盘，不能移库");
+ throw new ServiceException("源库位：" + sourceLocation.getCode() + "存在入库组盘，不能移库");
}
if (inventoryHeaderService.getUncompleteShipmentContainer(sourceLocationCode, warehouseCode) > 0) {
- return AjaxResult.error("源库位：" + sourceLocation.getCode() + "存在出库组盘，不能移库");
+ throw new ServiceException("源库位：" + sourceLocation.getCode() + "存在出库组盘，不能移库");
}
if (StringUtils.isNull(desLocation)) {
- return AjaxResult.error("目标库位：" + desLocationCode + "未找到");
+ throw new ServiceException("目标库位：" + desLocationCode + "未找到");
}
if (!QuantityConstant.STATUS_LOCATION_EMPTY.equals(desLocation.getStatus())) {
- return AjaxResult.error("目标库位：" + desLocationCode + "状态非空闲");
+ throw new ServiceException("目标库位：" + desLocationCode + "状态非空闲");
}
if (StringUtils.isNotEmpty(desLocation.getContainerCode())) {
- return AjaxResult.error("目标库位：" + desLocationCode + "存在托盘");
+ throw new ServiceException("目标库位：" + desLocationCode + "存在托盘");
}
if (taskHeaderService.getUncompleteTaskInNear(desLocation) > 0) {
- return AjaxResult.error("目标库位：" + desLocationCode + "旁边存在任务，请完成任务以后再分配");
+ throw new ServiceException("目标库位：" + desLocationCode + "旁边存在任务，请完成任务以后再分配");
}
if (!sourceLocation.getRoadway().equals(desLocation.getRoadway())) {
- return AjaxResult.error("目标库位和源库位不在同一个巷道");
+ throw new ServiceException("目标库位和源库位不在同一个巷道");
}
if (!sourceLocation.getHigh().equals(desLocation.getHigh())) {
- return AjaxResult.error("目标库位和源库位高度不一样");
+ throw new ServiceException("目标库位和源库位高度不一样");
}
if (!sourceLocation.getLocationType().equals(desLocation.getLocationType())) {
- return AjaxResult.error("目标库位和源库位库位类型不一样");
+ throw new ServiceException("目标库位和源库位库位类型不一样");
}
if (!sourceLocation.getArea().equals(desLocation.getArea())) {
- return AjaxResult.error("目标库位和源库位不在同一个区域");
+ throw new ServiceException("目标库位和源库位不在同一个区域");
}
//创建移库任务前，记录托盘的状态
@@ -122,14 +122,14 @@ public class TransferTaskService {
if (taskHeader != null) {
preTaskNo = taskHeader.getId();
} else {
- return AjaxResult.error("源库位：" + sourceLocationCode + "旁边库位有托盘无法移库");
+ throw new ServiceException("源库位：" + sourceLocationCode + "旁边库位有托盘无法移库");
}
} else {
TaskHeader taskHeader = taskHeaderService.getOne(new LambdaQueryWrapper<TaskHeader>()
.eq(TaskHeader::getToLocation, locationCode)
.lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED));
if (taskHeader != null) {
- return AjaxResult.error("源库位：" + sourceLocationCode + "旁边库位有任务无法移库");
+ throw new ServiceException("源库位：" + sourceLocationCode + "旁边库位有任务无法移库");
}
}
}
diff --git a/src/main/resources/application-druid.properties b/src/main/resources/application-druid.properties
index 5ba58c9..fb16f5a 100644
--- a/src/main/resources/application-druid.properties
+++ b/src/main/resources/application-druid.properties
@@ -1,7 +1,15 @@
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-# server
-#spring.datasource.druid.master.url=jdbc:mysql://localhost:13366/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8&autoReconnect=true&maxReconnects=9999&initialTimeout=30&rewriteBatchedStatements=true
+# server1
+#spring.datasource.druid.master.url=jdbc:mysql://192.168.100.123:13366/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8&autoReconnect=true&maxReconnects=9999&initialTimeout=30&rewriteBatchedStatements=true
+#spring.datasource.druid.master.username=root
+#spring.datasource.druid.master.password=HHsoft123.
+# server2
+#spring.datasource.druid.master.url=jdbc:mysql://192.168.100.134:13367/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8&autoReconnect=true&maxReconnects=9999&initialTimeout=30&rewriteBatchedStatements=true
+#spring.datasource.druid.master.username=root
+#spring.datasource.druid.master.password=HHsoft123.
+# server3
+#spring.datasource.druid.master.url=jdbc:mysql://192.168.100.136:13368/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8&autoReconnect=true&maxReconnects=9999&initialTimeout=30&rewriteBatchedStatements=true
#spring.datasource.druid.master.username=root
#spring.datasource.druid.master.password=HHsoft123.
# aliyun
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eb8fb70..84c3e3b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -109,7 +109,8 @@ spring:
# redis 配置
redis:
# 地址
- host: 192.168.100.134
+ # host: 192.168.100.134
+ host: localhost
# 端口，默认为6379
port: 6379
# 密码