From 654a8942e380ca9d36e01c070b413cc5bb1f80cb Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Sun, 26 Mar 2023 12:42:08 +0800
Subject: [PATCH] 容器更新 任务排序
---
ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue | 4 ++++
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue | 4 ++++
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue | 6 ++++++
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue | 4 ++++
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue | 4 ++++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java | 6 +++---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java | 10 ++++++++++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java | 14 ++++++++++++++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java | 10 +++++++++-
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java | 4 ++--
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java | 7 ++++---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java | 4 ++--
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java | 11 +++++++----
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/service/impl/AgvTaskServiceImpl.java | 3 +--
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java | 11 +----------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java | 64 ++++++++++++++++++++++++++++++++++++++--------------------------
16 files changed, 113 insertions(+), 53 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue b/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
index d96dd74..9e2f4f7 100644
--- a/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
@@ -144,6 +144,10 @@
data () {
return {
description: 'AGV任务管理页面',
+ isorter: {
+ column: 'status',
+ order: 'asc',
+ },
// 表头
columns: [
{
diff --git a/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
index 80b343b..634a07f 100644
--- a/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
@@ -192,6 +192,10 @@ export default {
return {
description: '任务表管理页面',
zoneList: [],
+ isorter: {
+ column: 'status',
+ order: 'asc',
+ },
// 表头
columns: [
{
diff --git a/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
index 9885950..016d63c 100644
--- a/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
@@ -172,6 +172,7 @@ import {execute} from '@/api/api'
import {getZoneList, handleEmptyOut, handlePickupError, handleDoubleIn} from '@/api/api'
import EmptyInTaskModal from './modules/EmptyInTaskModal'
import ManyEmptyInTaskModal from "./modules/ManyEmptyInTaskModal";
+import {filterObj} from "@/utils/util";
export default {
name: "TaskHeaderList",
@@ -186,6 +187,10 @@ export default {
return {
description: '任务表管理页面',
zoneList: [],
+ isorter: {
+ column: 'status',
+ order: 'asc',
+ },
// 表头
columns: [
{
@@ -292,6 +297,7 @@ export default {
},
selectedMainId: '',
superFieldList: [],
+
}
},
created() {
diff --git a/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
index f24948e..e4d459f 100644
--- a/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
@@ -189,6 +189,10 @@ export default {
data() {
return {
description: '任务表管理页面',
+ isorter: {
+ column: 'status',
+ order: 'asc',
+ },
// 表头
columns: [
{
diff --git a/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
index 009a8f8..449059c 100644
--- a/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
@@ -194,6 +194,10 @@ export default {
return {
description: '任务表管理页面',
zoneList: [],
+ isorter: {
+ column: 'status',
+ order: 'asc',
+ },
// 表头
columns: [
{
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
index bc07170..7b58a6d 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
@@ -167,12 +167,12 @@ public class WcsServiceImpl implements WcsService {
return Result.error("分配库位时，没有库位可分配");
}
boolean success =
- locationService.updateStatusByOldStatus(locationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+ locationService.updateStatusByOriginStatus(locationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
if (!success) {
throw new JeecgBootException("分配库位时，更新库位状态失败");
}
if (StringUtils.isNotEmpty(taskHeader.getToLocationCode()) && !locationCode.equals(taskHeader.getToLocationCode())) {
- success = locationService.updateStatusByOldStatus(taskHeader.getToLocationCode(), QuantityConstant.STATUS_LOCATION_EMPTY,
+ success = locationService.updateStatusByOriginStatus(taskHeader.getToLocationCode(), QuantityConstant.STATUS_LOCATION_EMPTY,
QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode);
if (!success) {
throw new JeecgBootException("分配库位时，更新之前分配的库位状态失败");
@@ -595,7 +595,7 @@ public class WcsServiceImpl implements WcsService {
}
// 6. 锁定WMS分配的库位
boolean success =
- locationService.updateStatusByOldStatus(locationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+ locationService.updateStatusByOriginStatus(locationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
if (!success) {
throw new JeecgBootException("重入处理失败， 更新库位状态失败");
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java
index 7c6c222..571e139 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java
@@ -21,6 +21,16 @@ public interface IContainerService extends IService<Container> {
boolean updateStatus(String containerCode, String status, String wareohuseCode);
+ /**
+ * 更新容器状态status，条件是originStatus,如果originStatus条件不满足，那么返回false
+ * @param containerCode
+ * @param status
+ * @param originStatus
+ * @param wareohuseCode
+ * @return
+ */
+ boolean updateStatusByOriginStatus(String containerCode, String status, String originStatus, String wareohuseCode);
+
boolean restoreContainer(String containerCode, String wareohuseCode);
boolean updateLocationCodeAndStatus(String containerCode, String locationCode, String status, String warehouseCode);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
index dc5c6a7..0c40a69 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
@@ -81,6 +81,20 @@ public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container
}
@Override
+ public boolean updateStatusByOriginStatus(String containerCode, String status, String originStatus, String wareohuseCode) {
+ Container container = this.getContainerByCode(containerCode, wareohuseCode);
+ if (container == null) {
+ return false;
+ }
+ container.setLastStatus(container.getStatus());
+ container.setStatus(status);
+ LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
+ containerLambdaQueryWrapper.eq(Container::getCode, containerCode).eq(Container::getStatus, originStatus).eq(Container::getWarehouseCode, wareohuseCode);
+ boolean result = this.update(container, containerLambdaQueryWrapper);
+ return result;
+ }
+
+ @Override
public boolean restoreContainer(String containerCode, String wareohuseCode) {
Container container = this.getContainerByCode(containerCode, wareohuseCode);
if (container == null) {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
index 44b67d4..0c33621 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
@@ -27,7 +27,15 @@ public interface ILocationService extends IService<Location> {
boolean updateStatus(String locationCode, String status, String warehouseCode);
- boolean updateStatusByOldStatus(String locationCode, String status, String oldStatus, String warehouseCode);
+ /**
+ * 更新库位状态status，条件是originStatus,如果originStatus条件不满足，那么返回false
+ * @param locationCode
+ * @param status
+ * @param originStatus
+ * @param warehouseCode
+ * @return
+ */
+ boolean updateStatusByOriginStatus(String locationCode, String status, String originStatus, String warehouseCode);
boolean updateContainerCodeAndStatus(String locationCode, String containerCode, String status, String warehouseCode);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
index 8a531ba..970bd79 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
@@ -93,13 +93,13 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
}
@Override
- public boolean updateStatusByOldStatus(String locationCode, String status, String oldStatus, String warehouseCode) {
+ public boolean updateStatusByOriginStatus(String locationCode, String status, String originStatus, String warehouseCode) {
Location location = getLocationByCode(locationCode, warehouseCode);
if (location == null) {
return false;
}
LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
- locationLambdaQueryWrapper.eq(Location::getStatus, oldStatus).eq(Location::getCode, locationCode).eq(Location::getWarehouseCode, warehouseCode);
+ locationLambdaQueryWrapper.eq(Location::getStatus, originStatus).eq(Location::getCode, locationCode).eq(Location::getWarehouseCode, warehouseCode);
location.setStatus(status);
boolean result = update(location, locationLambdaQueryWrapper);
return result;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
index ca834c8..3a1141d 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
@@ -120,14 +120,15 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
if (receiptContainerDetailList.size() == 0) {
return Result.error("id:" + receiptContainerHeader.getId() + "的入库组盘，没有组盘明细，请先组盘！");
}
- boolean success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, warehouseCode);
+ boolean success = containerService.updateStatusByOriginStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, QuantityConstant.STATUS_CONTAINER_EMPTY,
+ warehouseCode);
if (!success) {
throw new JeecgBootException("更新容器状态失败");
}
String fromLocationCode = receiptContainerHeader.getFromLocationCode();
String toLocaitonCode = receiptContainerHeader.getToLocationCode();
if (StringUtils.isNotEmpty(fromLocationCode)) {
- success = locationService.updateStatusByOldStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY,
+ success = locationService.updateStatusByOriginStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY,
warehouseCode);
if (!success) {
throw new JeecgBootException("更新起始库位状态失败");
@@ -135,7 +136,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
}
String zoneCode = null;
if (StringUtils.isNotEmpty(toLocaitonCode)) {
- success = locationService.updateStatusByOldStatus(toLocaitonCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY,
+ success = locationService.updateStatusByOriginStatus(toLocaitonCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY,
warehouseCode);
if (!success) {
throw new JeecgBootException("更新目标库位状态失败");
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
index 816b325..72f7fcd 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
@@ -475,8 +475,8 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
if (!success) {
throw new JeecgBootException("生成出库任务时, 更新容器失败" + containerCode);
}
- success =
- locationService.updateStatusByOldStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+ success = locationService.updateStatusByOriginStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY,
+ warehouseCode);
if (!success) {
throw new JeecgBootException("生成出库任务时, 更新库位失败" + fromLocationCode);
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
index e87c805..a9fa5aa 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
@@ -223,14 +223,17 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
}
// 生成任务同时锁定库位
- boolean success = locationService.updateStatusByOldStatus(location.getCode(), QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY,
- warehouseCode);
+ boolean success = locationService.updateStatusByOriginStatus(location.getCode(), QuantityConstant.STATUS_LOCATION_LOCK,
+ QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
if (!success) {
throw new JeecgBootException("更新库位状态失败");
}
// 生成任务同时锁定容器
- containerServiceImpl.updateStatus(location.getContainerCode(), QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode);
-
+ success = containerServiceImpl.updateStatusByOriginStatus(location.getContainerCode(), QuantityConstant.STATUS_LOCATION_LOCK,
+ QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+ if (!success) {
+ throw new JeecgBootException("更新容器状态失败");
+ }
// 每个明细单生成一张主任务，子单就是任务明细。
TaskHeader task = new TaskHeader();
task.setWarehouseCode(warehouseCode);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/service/impl/AgvTaskServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/service/impl/AgvTaskServiceImpl.java
index 85fe26c..4a73a54 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/service/impl/AgvTaskServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/service/impl/AgvTaskServiceImpl.java
@@ -22,7 +22,6 @@ import org.jeecg.utils.constant.QuantityConstant;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.jeecg.common.exception.JeecgBootException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -173,7 +172,7 @@ public class AgvTaskServiceImpl extends ServiceImpl<AgvTaskMapper, AgvTask> impl
if (inventoryDetailList.size() != 0) {
containerStatus = QuantityConstant.STATUS_CONTAINER_SOME;
}
- success = containerService.updateStatus(containerCode, containerStatus, warehouseCode);
+ success = containerService.updateStatusByOriginStatus(containerCode, containerStatus, QuantityConstant.STATUS_CONTAINER_LOCK, warehouseCode);
if (!success) {
throw new JeecgBootException("取消AGV任务。 更新容器状态失败");
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
index 9042153..dd9fae6 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
@@ -42,16 +42,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
index 5f1b4ed..7f5da52 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -289,17 +289,18 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
throw new JeecgBootException("创建移库任务时，创建任务失败");
}
- success =
- locationService.updateStatusByOldStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+ success = locationService.updateStatusByOriginStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY,
+ warehouseCode);
if (!success) {
throw new JeecgBootException("创建移库任务时， 起始库位" + fromLocationCode + "更新失败");
}
success =
- locationService.updateStatusByOldStatus(toLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+ locationService.updateStatusByOriginStatus(toLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
if (!success) {
throw new JeecgBootException("创建移库任务时， 终点库位" + toLocationCode + "更新失败");
}
- success = containerService.updateStatus(fromLocation.getContainerCode(), QuantityConstant.STATUS_CONTAINER_LOCK, warehouseCode);
+ success = containerService.updateStatusByOriginStatus(fromLocation.getContainerCode(), QuantityConstant.STATUS_CONTAINER_LOCK,
+ QuantityConstant.STATUS_CONTAINER_EMPTY, warehouseCode);
if (!success) {
throw new JeecgBootException("创建移库任务时，容器" + fromLocation.getContainerCode() + "更新失败");
}
@@ -352,12 +353,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
throw new JeecgBootException("创建出库查看任务时，更新库存详情失败");
}
}
- success =
- locationService.updateStatusByOldStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+ success = locationService.updateStatusByOriginStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY,
+ warehouseCode);
if (!success) {
throw new JeecgBootException("创建出库查看任务时，更新库位状态失败");
}
- success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, warehouseCode);
+ success = containerService.updateStatusByOriginStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, QuantityConstant.STATUS_CONTAINER_EMPTY,
+ warehouseCode);
if (!success) {
throw new JeecgBootException("创建出库查看任务时，更新容器状态失败");
}
@@ -425,7 +427,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
if (!success) {
return Result.error("创建跨站任务时, 创建任务失败");
}
- success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, warehouseCode);
+ success = containerService.updateStatusByOriginStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, QuantityConstant.STATUS_CONTAINER_EMPTY,
+ warehouseCode);
if (!success) {
return Result.error("创建跨站任务时, 更新容器状态失败");
}
@@ -517,7 +520,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
if (!container.getStatus().equals(QuantityConstant.STATUS_CONTAINER_EMPTY)) {
return Result.error("创建空托盘组入库任务时，容器状态不为空容器");
}
- boolean success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, warehouseCode);
+ boolean success = containerService.updateStatusByOriginStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, QuantityConstant.STATUS_CONTAINER_EMPTY,
+ warehouseCode);
if (!success) {
throw new JeecgBootException("创建空托盘组入库任务时, 更新容器状态失败");
}
@@ -529,7 +533,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
if (!toLocation.getStatus().equals(QuantityConstant.STATUS_LOCATION_EMPTY)) {
return Result.error("创建空托盘组入库任务时，目标库位状态不是空闲");
}
- success = locationService.updateStatusByOldStatus(toLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY,
+ success = locationService.updateStatusByOriginStatus(toLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY,
warehouseCode);
if (!success) {
throw new JeecgBootException("创建空托盘组入库任务时, 更新库位状态失败");
@@ -582,12 +586,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
if (StringUtils.isEmpty(zoneCode)) {
return Result.error("创建空托盘组出库任务时, 库区为空");
}
- boolean success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, warehouseCode);
+ boolean success = containerService.updateStatusByOriginStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, QuantityConstant.STATUS_CONTAINER_EMPTY,
+ warehouseCode);
if (!success) {
throw new JeecgBootException("创建空托盘组出库任务时， 更新容器状态失败");
}
- success =
- locationService.updateStatusByOldStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode);
+ success = locationService.updateStatusByOriginStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_LOCK,
+ warehouseCode);
if (!success) {
throw new JeecgBootException("创建空托盘组出库任务时， 更新库位状态失败");
}
@@ -982,14 +987,15 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
if (!QuantityConstant.STATUS_LOCATION_EMPTY.equals(toLocation.getStatus())) {
return Result.error("创建空托盘入库时， 目标库位非空闲");
}
- boolean success = locationService.updateStatusByOldStatus(toLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY,
- warehouseCode);
+ boolean success = locationService.updateStatusByOriginStatus(toLocationCode, QuantityConstant.STATUS_LOCATION_LOCK,
+ QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
if (!success) {
throw new JeecgBootException("创建空托盘入库时，更新库位状态失败");
}
}
- boolean success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, warehouseCode);
+ boolean success = containerService.updateStatusByOriginStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, QuantityConstant.STATUS_CONTAINER_EMPTY,
+ warehouseCode);
if (!success) {
throw new JeecgBootException("创建空托盘入库时，更新容器状态失败");
}
@@ -1049,12 +1055,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
if (port == null) {
return Result.error("创建空托盘出库时， 没有找到出库口" + toPortCode);
}
- boolean success =
- locationService.updateStatusByOldStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+ boolean success = locationService.updateStatusByOriginStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, QuantityConstant.STATUS_LOCATION_EMPTY,
+ warehouseCode);
if (!success) {
throw new JeecgBootException("创建空托盘出库时，更新库位状态失败");
}
- success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, warehouseCode);
+ success = containerService.updateStatusByOriginStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, QuantityConstant.STATUS_CONTAINER_EMPTY,
+ warehouseCode);
if (!success) {
throw new JeecgBootException("创建空托盘出库时，更新容器状态失败");
}
@@ -1788,7 +1795,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
List<InventoryDetail> inventoryDetailList = inventoryDetailService.getInventoryDetailListByContainerCode(containerCode, warehouseCode);
if (inventoryDetailList.size() != 0) {
if (fromLocationCode.equals(toLocationCode)) {
- success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_SOME, warehouseCode);
+ success = containerService.updateStatusByOriginStatus(containerCode, QuantityConstant.STATUS_CONTAINER_SOME, QuantityConstant.STATUS_CONTAINER_LOCK,
+ warehouseCode);
} else {
success = containerService.updateLocationCodeAndStatus(containerCode, toLocationCode, QuantityConstant.STATUS_CONTAINER_SOME, warehouseCode);
}
@@ -1796,7 +1804,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
throw new JeecgBootException("完成出库查看任务时，更新容器状态失败");
}
} else {
- success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_EMPTY, warehouseCode);
+ success = containerService.updateStatusByOriginStatus(containerCode, QuantityConstant.STATUS_CONTAINER_EMPTY, QuantityConstant.STATUS_CONTAINER_LOCK,
+ warehouseCode);
if (!success) {
throw new JeecgBootException("完成出库查看任务时，更新容器状态失败");
}
@@ -2022,7 +2031,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
throw new JeecgBootException("完成出库查看任务时，更新库存头失败");
}
if (fromLocationCode.equals(toLocationCode)) {
- success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_SOME, warehouseCode);
+ success = containerService.updateStatusByOriginStatus(containerCode, QuantityConstant.STATUS_CONTAINER_SOME, QuantityConstant.STATUS_CONTAINER_LOCK,
+ warehouseCode);
} else {
success = containerService.updateLocationCodeAndStatus(containerCode, toLocationCode, QuantityConstant.STATUS_CONTAINER_SOME, warehouseCode);
}
@@ -2031,7 +2041,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
} else {
if (fromLocationCode.equals(toLocationCode)) {
- success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_SOME, warehouseCode);
+ success = containerService.updateStatusByOriginStatus(containerCode, QuantityConstant.STATUS_CONTAINER_SOME, QuantityConstant.STATUS_CONTAINER_LOCK,
+ warehouseCode);
} else {
success = containerService.updateLocationCodeAndStatus(containerCode, toLocationCode, QuantityConstant.STATUS_CONTAINER_SOME, warehouseCode);
}
@@ -2097,7 +2108,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
if (!success) {
throw new JeecgBootException("创建跨站任务时, 更新任务失败");
}
- success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_EMPTY, warehouseCode);
+ success = containerService.updateStatusByOriginStatus(containerCode, QuantityConstant.STATUS_CONTAINER_EMPTY, QuantityConstant.STATUS_CONTAINER_LOCK,
+ warehouseCode);
if (!success) {
throw new JeecgBootException("创建跨站任务时, 更新容器状态失败");
}
@@ -2255,14 +2267,14 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
boolean success = false;
if (StringUtils.isNotEmpty(fromLocationCode)) {
- success = locationService.updateStatusByOldStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_EMPTY, QuantityConstant.STATUS_LOCATION_LOCK,
+ success = locationService.updateStatusByOriginStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_EMPTY, QuantityConstant.STATUS_LOCATION_LOCK,
warehouseCode);
if (!success) {
throw new JeecgBootException("取消任务时， 更新起始库位状态失败");
}
}
if (StringUtils.isNotEmpty(toLocationCode)) {
- success = locationService.updateStatusByOldStatus(toLocationCode, QuantityConstant.STATUS_LOCATION_EMPTY, QuantityConstant.STATUS_LOCATION_LOCK,
+ success = locationService.updateStatusByOriginStatus(toLocationCode, QuantityConstant.STATUS_LOCATION_EMPTY, QuantityConstant.STATUS_LOCATION_LOCK,
warehouseCode);
if (!success) {
throw new JeecgBootException("取消任务时， 更新目标库位状态失败");
--
libgit2 0.22.2