From abfe8e59b26981b0a3ea513b73876a1b4eb84259 Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Tue, 25 Jul 2023 16:50:20 +0800
Subject: [PATCH] 更新库存表状态事务修复，取消任务事务修复
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java | 39 ++++++++++++++++++++-------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java | 3 +--
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
index 7ed5964..e23251f 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
@@ -7,6 +7,7 @@ import java.util.List;
import javax.annotation.Resource;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.wms.config.container.entity.Container;
import org.jeecg.modules.wms.config.container.service.IContainerService;
import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
@@ -68,6 +69,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMappe
}
@Override
+ @Transactional
public boolean updateInventoryContainerStatusByContainerCode(String containerCode, String warehouseCode) {
Container container = containerService.getContainerByCode(containerCode, warehouseCode);
if (container == null) {
@@ -75,63 +77,62 @@ public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMappe
}
InventoryHeader inventoryHeader = inventoryHeaderService.getInventoryHeaderByContainerCode(containerCode, warehouseCode);
if (inventoryHeader != null) {
- boolean success = inventoryHeaderService.updateContainerStatusById(container.getStatus(), inventoryHeader.getId());
- if (!success) {
- return success;
+ if (!inventoryHeaderService.updateContainerStatusById(container.getStatus(), inventoryHeader.getId())) {
+ throw new JeecgBootException("更新库存头表状态失败");
}
List<InventoryDetail> inventoryDetailList = inventoryDetailService.getInventoryDetailListByContainerCode(containerCode, warehouseCode);
- List<InventoryDetail> inventoryDetailList1 = new ArrayList<>();
+ List<InventoryDetail> updateInventoryDetailList = new ArrayList<>();
if (inventoryDetailList.size() > 0) {
for (InventoryDetail inventoryDetail : inventoryDetailList) {
- inventoryDetail.setContainerStatus(container.getStatus());
- InventoryDetail inventoryDetail1 = new InventoryDetail();
- inventoryDetail1.setId(inventoryDetail.getId());
- inventoryDetail1.setContainerStatus(container.getStatus());
- inventoryDetailList1.add(inventoryDetail1);
+ InventoryDetail updateInventoryDetail = new InventoryDetail();
+ updateInventoryDetail.setId(inventoryDetail.getId());
+ updateInventoryDetail.setContainerStatus(container.getStatus());
+ updateInventoryDetailList.add(updateInventoryDetail);
+ }
+ if (!inventoryDetailService.updateBatchById(updateInventoryDetailList)) {
+ throw new JeecgBootException("更新库存明细表状态失败");
}
- success = inventoryDetailService.updateBatchById(inventoryDetailList1);
}
- return success;
}
return true;
}
@Override
+ @Transactional
public boolean updateInventoryLocationAndZoneById(String locationCode, String zoneCode, Integer id) {
InventoryHeader inventoryHeader = new InventoryHeader();
inventoryHeader.setId(id);
inventoryHeader.setLocationCode(locationCode);
inventoryHeader.setZoneCode(zoneCode);
- boolean success = inventoryHeaderService.updateById(inventoryHeader);
- return success;
+ return inventoryHeaderService.updateById(inventoryHeader);
}
@Override
+ @Transactional
public boolean updateContainerStatusById(String containerStatus, Integer id) {
InventoryHeader inventoryHeader = new InventoryHeader();
inventoryHeader.setId(id);
inventoryHeader.setContainerStatus(containerStatus);
- boolean success = inventoryHeaderService.updateById(inventoryHeader);
- return success;
+ return inventoryHeaderService.updateById(inventoryHeader);
}
@Override
+ @Transactional
public boolean updateContainerStatusAndLocationCode(String containerStatus, String locationCode, Integer id) {
InventoryHeader inventoryHeader = new InventoryHeader();
inventoryHeader.setId(id);
inventoryHeader.setContainerStatus(containerStatus);
inventoryHeader.setLocationCode(locationCode);
- boolean success = inventoryHeaderService.updateById(inventoryHeader);
- return success;
+ return inventoryHeaderService.updateById(inventoryHeader);
}
@Override
+ @Transactional
public boolean updateLocationCodeById(String locationCode, Integer id) {
InventoryHeader inventoryHeader = new InventoryHeader();
inventoryHeader.setId(id);
inventoryHeader.setLocationCode(locationCode);
- boolean success = inventoryHeaderService.updateById(inventoryHeader);
- return success;
+ return inventoryHeaderService.updateById(inventoryHeader);
}
}
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 365ac88..f39c5c9 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
@@ -367,8 +367,7 @@ public class TaskHeaderController extends HuahengBaseController {
result = handleMultiProcess("cancelTask", new MultiProcessListener() {
@Override
public Result<?> doProcess() {
- Result result = taskHeaderService.cancelTask(taskId);
- return result;
+ return taskHeaderService.cancelTask(taskId);
}
});
}
--
libgit2 0.22.2