update判断

xumiao
1 parent 966a5b27
Showing 7 changed files with 63 additions and 25 deletions
src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
src/main/java/com/huaheng/pc/config/location/service/LocationService.java
src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/service/CycleCountTaskService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TransferTaskService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
@@ -166,7 +166,9 @@ public class OverrideHandleServiceImpl implements OverrideHandleService {
         if (StringUtils.isEmpty(newLocationCode)) {
             return AjaxResult.error("没有库位可以分配");
         }
-        locationService.updateStatus(newLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode);
+        if (!locationService.updateStatus(newLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode)) {
+            throw new ServiceException("更新库位状态失败");
+        }
         String toLocationCode = taskHeader.getToLocation();
  
         //修改任务
@@ -106,7 +106,7 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
      * @return
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional
     public AjaxResult warecellAllocation(WcsTask wcsTask) {
         //1、判断非空字段
         if (StringUtils.isEmpty(wcsTask.getTaskNo())) {
@@ -211,13 +211,14 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
         if (StringUtils.isEmpty(locationCode)) {
             return AjaxResult.error("没有库位可分配");
         }
-       
-        locationService.updateStatus(locationCode,
-                QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode);
-        if (StringUtils.isNotEmpty(taskHeader.getToLocation()) &&
-                !locationCode.equals(taskHeader.getToLocation())) {
-            locationService.updateStatus(taskHeader.getToLocation(),
-                    QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+
+        if (!locationService.updateStatus(locationCode, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode)) {
+            throw new ServiceException("更新库位状态失败");
+        }
+        if (StringUtils.isNotEmpty(taskHeader.getToLocation()) && !locationCode.equals(taskHeader.getToLocation())) {
+            if (!locationService.updateStatus(taskHeader.getToLocation(), QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode)) {
+                throw new ServiceException("更新库位状态失败");
+            }
         }
  
         if (receiptContainerDetailList != null && receiptContainerDetailList.size() > 0) {
@@ -40,7 +40,7 @@ public interface LocationService extends IService&lt;Location&gt;{
      */
     void updateStatus(String locationCode, String status);
  
-    void updateStatus(String locationCode, String status, String warehouseCode);
+    boolean updateStatus(String locationCode, String status, String warehouseCode);
  
     /**
      * 通过定位规则查找库位
@@ -20,6 +20,7 @@ import com.huaheng.pc.config.zone.domain.Zone;
 import com.huaheng.pc.config.zone.service.ZoneService;
 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
  
 import javax.annotation.Resource;
 import java.text.MessageFormat;
@@ -322,17 +323,36 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
      * @param status
      */
     @Override
+    @Transactional
     public void updateStatus(String locationCode, String status) {
         if (StringUtils.isNotEmpty(locationCode)) {
-            locationMapper.updateStatus("CS0001", locationCode, status);
+//            locationMapper.updateStatus("CS0001", locationCode, status);
+            LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper=Wrappers.lambdaUpdate();
+            locationLambdaUpdateWrapper
+                    .ne(Location::getStatus,status)
+                    .eq(Location::getCode,locationCode)
+                    .eq(Location::getWarehouseCode,"CS0001")
+                    .set(Location::getStatus,status);
+            if (!locationService.update(locationLambdaUpdateWrapper)) {
+                throw new ServiceException("更新库位状态失败");
+            }
         }
     }
  
     @Override
-    public void updateStatus(String locationCode, String status, String warehouseCode) {
+    @Transactional
+    public boolean updateStatus(String locationCode, String status, String warehouseCode) {
         if (StringUtils.isNotEmpty(locationCode)) {
-            locationMapper.updateStatus(warehouseCode, locationCode, status);
+//            locationMapper.updateStatus(warehouseCode, locationCode, status);
+            LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper=Wrappers.lambdaUpdate();
+            locationLambdaUpdateWrapper
+                    .ne(Location::getStatus,status)
+                    .eq(Location::getCode,locationCode)
+                    .eq(Location::getWarehouseCode,warehouseCode)
+                    .set(Location::getStatus,status);
+           return  locationService.update(locationLambdaUpdateWrapper);
         }
+        return false;
     }
  
     /**
@@ -356,8 +376,9 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
             updateWrapper.set(Location::getContainerCode, containerCode)
                     .set(Location::getStatus, status)
                     .eq(Location::getWarehouseCode, "CS0001")
-                    .eq(Location::getCode, locationCode);
-            this.update(updateWrapper);
+                    .eq(Location::getCode, locationCode)
+                    .ne(Location::getStatus,status);
+            locationService.update(updateWrapper);
         }
     }
  
@@ -369,8 +390,9 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
             updateWrapper.set(Location::getContainerCode, containerCode)
                     .set(Location::getStatus, status)
                     .eq(Location::getWarehouseCode, warehouseCode)
-                    .eq(Location::getCode, locationCode);
-            this.update(updateWrapper);
+                    .eq(Location::getCode, locationCode)
+                    .ne(Location::getStatus,status);
+            locationService.update(updateWrapper);
         }
     }    public LocationInfo getAllLocation(String type) {
         if (StringUtils.isNotEmpty(type)) {
@@ -344,8 +344,9 @@ public class CycleCountTaskService {
         //更新主单状态
         cycleCountHeaderService.updataHeaderStatus(cycleCountDetail.getCycleCountHeadCode());
         //释放库位
-        locationService.updateStatus(cycleCountDetail.getLocationCode(),
-                QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+        if (!locationService.updateStatus(cycleCountDetail.getLocationCode(), QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode)) {
+            throw new ServiceException("更新库位状态失败");
+        }
  
         return AjaxResult.success("完成盘点任务成功！");
  
@@ -155,8 +155,12 @@ public class TransferTaskService {
  
  
         if (taskHeaderService.save(taskHeader)) {
-            locationService.updateStatus(sourceLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode);
-            locationService.updateStatus(desLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode);
+            if (!locationService.updateStatus(sourceLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode)) {
+                throw new ServiceException("更新库位状态失败");
+            }
+            if (!locationService.updateStatus(desLocationCode, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode)) {
+                throw new ServiceException("更新库位状态失败");
+            }
             containerService.updateLocationCodeAndStatus(sourceLocation.getContainerCode(),
                     sourceLocationCode, QuantityConstant.STATUS_CONTAINER_LOCK, warehouseCode);
         } else {
@@ -234,7 +234,9 @@ public class WorkTaskService {
         }
         //锁库位
         if (StringUtils.isNotEmpty(destinationLocation)) {
-            locationService.updateStatus(destinationLocation, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode);
+            if (!locationService.updateStatus(destinationLocation, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode)) {
+                 throw new ServiceException("更新库位状态失败！");
+            }
         }
         WcsTask wcsTask = new WcsTask();
         wcsTask.setTaskType(taskHeader.getTaskType());
@@ -394,7 +396,9 @@ public class WorkTaskService {
         taskHeader.setPort(port);
         if(taskHeaderService.save(taskHeader)){
             //锁定库位状态
-            locationService.updateStatus(locationCode,QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode);
+            if (!locationService.updateStatus(locationCode, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode)) {
+                throw new ServiceException("更新库位状态失败！");
+            }
             LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
             containerLambdaQueryWrapper.eq(Container::getCode, conCode);
             Container container = containerService.getOne(containerLambdaQueryWrapper);
@@ -580,7 +584,9 @@ public class WorkTaskService {
             throw new ServiceException("空托出库主表生成失败！");
         }
         //锁定库位状态
-        locationService.updateStatus(locationCode,QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode);
+        if (!locationService.updateStatus(locationCode, QuantityConstant.STATUS_LOCATION_LOCK, warehouseCode)) {
+            throw new ServiceException("更新库位状态失败！");
+        }
         Container container = containerService.getContainerByCode(containerCode, warehouseCode);
         container.setStatus(QuantityConstant.STATUS_CONTAINER_LOCK);
         containerService.updateById(container);
@@ -904,7 +910,9 @@ public class WorkTaskService {
             throw new ServiceException("空托出库主表生成失败！");
         }
         //锁定库位状态
-        locationService.updateStatus(locationCode,QuantityConstant.STATUS_LOCATION_LOCK, ShiroUtils.getWarehouseCode());
+        if (!locationService.updateStatus(locationCode, QuantityConstant.STATUS_LOCATION_LOCK, ShiroUtils.getWarehouseCode())) {
+            throw new ServiceException("更新库位状态失败！");
+        }
         containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, ShiroUtils.getWarehouseCode());
  
         return AjaxResult.success(taskHeader.getId());