From ab3e9db947b59d4fdab49a5d8cd90b7f7e4b4098 Mon Sep 17 00:00:00 2001
From: xumiao <1365304440@qq.com>
Date: Thu, 25 May 2023 19:09:48 +0800
Subject: [PATCH] update判断
---
src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java | 14 +++++++++++---
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java | 2 +-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java b/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
index e973ce9..164c145 100644
--- a/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
@@ -370,6 +370,7 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
* 修改容器和库位状态
*/
@Override
+ @Transactional
public void updateContainerCodeAndStatus(String locationCode, String containerCode, String status) {
if (StringUtils.isNotEmpty(locationCode) || StringUtils.isNotEmpty(containerCode)) {
LambdaUpdateWrapper<Location> updateWrapper = Wrappers.lambdaUpdate();
@@ -378,11 +379,14 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
.eq(Location::getWarehouseCode, "CS0001")
.eq(Location::getCode, locationCode)
.ne(Location::getStatus,status);
- locationService.update(updateWrapper);
+ if (!locationService.update(updateWrapper)) {
+ throw new ServiceException("更新库位状态失败");
+ }
}
}
@Override
+ @Transactional
public void updateContainerCodeAndStatus(String locationCode, String containerCode,
String status, String warehouseCode) {
if (StringUtils.isNotEmpty(locationCode) || StringUtils.isNotEmpty(containerCode)) {
@@ -392,9 +396,13 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
.eq(Location::getWarehouseCode, warehouseCode)
.eq(Location::getCode, locationCode)
.ne(Location::getStatus,status);
- locationService.update(updateWrapper);
+ if (!locationService.update(updateWrapper)) {
+ throw new ServiceException("更新库位状态失败");
+ }
}
- } public LocationInfo getAllLocation(String type) {
+ }
+
+ public LocationInfo getAllLocation(String type) {
if (StringUtils.isNotEmpty(type)) {
Location location = locationMapper.getAllLocation(ShiroUtils.getWarehouseCode(), type);
LocationInfo locationInfo = new LocationInfo();
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 b9cedf8..b73ad11 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
@@ -358,7 +358,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
* WMS完成任务
*/
@Override
- @Transactional(rollbackFor = Exception.class)
+ @Transactional
public AjaxResult completeTaskByWMS(Integer[] taskIds, String[] weightConvert) {
AjaxResult ajaxResult = null;
for (int i = 0; i < taskIds.length; i++) {
--
libgit2 0.22.2