出库完成时删除临时容器

mahuandong
1 parent 7b73017d
Showing 4 changed files with 43 additions and 18 deletions
src/main/java/com/huaheng/pc/config/container/service/ContainerService.java
src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -17,4 +17,7 @@ public interface ContainerService extends IService&lt;Container&gt;{
  
     void updateLocationCodeAndStatus(String containerCode, String locationCode, String status);
  
+    void removeContainer(String containType, String containCode);
+
+    void removeByCode(String containCode);
 }
@@ -18,6 +18,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.config.container.domain.Container;
 import com.huaheng.pc.config.container.mapper.ContainerMapper;
+import org.springframework.transaction.annotation.Transactional;
  
 @Service
 public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container> implements ContainerService{
@@ -127,5 +128,38 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
             containerMapper.updateLocationCodeAndStatus(ShiroUtils.getWarehouseCode(), containerCode, locationCode, status);
     }
  
+    /**
+     * 如果为临时容器，在取消组盘和出库任务完成时删除容器
+     * @param containerType 容器类型
+     * @param containerCode 容器编码
+     * @return
+     */
+    @Transactional
+    public void removeContainer(String containerType, String containerCode) {
+        if ("LS".equals(containerType)) {
+            LambdaQueryWrapper<Container> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            lambdaQueryWrapper.eq(Container::getCode,containerCode);
+            if (!this.remove(lambdaQueryWrapper)){
+                throw new ServiceException("删除临时容器失败");
+            }
+        }
+    }
+
+    /**
+     * 如果为临时容器出库任务完成时删除容器
+     * @param containCode
+     */
+    @Override
+    @Transactional
+    public void removeByCode(String containCode) {
+        LambdaQueryWrapper<Container> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(Container::getCode, containCode);
+        Container container = this.getOne(lambdaQueryWrapper);
+        if ("LS".equals(container.getContainerType())) {
+            if (!this.removeById(container.getId())){
+                throw new ServiceException("删除临时容器失败");
+            }
+        }
  
+    }
 }
@@ -164,7 +164,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
                     List<ReceiptContainerDetail> containerDetailList = receiptContainerDetailService.list(containerDetailLambda);
  
                     //如果是临时容器，取消组盘时删除容器表
-                    removeContainer(receiptContainerDetail.getContainerType(), receiptContainerDetail.getContainerCode());
+                    containerService.removeContainer(receiptContainerDetail.getContainerType(), receiptContainerDetail.getContainerCode());
  
                     //如果入库组盘没有该入库单的组盘信息，回滚入库单状态
                     if (containerDetailList == null){
@@ -393,21 +393,4 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         }
         return code;
     }
-
-    /**
-     * 如果为临时容器，在取消组盘和出库任务完成时删除容器
-     * @param containerType 容器类型
-     * @param containerCode 容器编码
-     * @return
-     */
-    @Transactional
-    public void removeContainer(String containerType, String containerCode) {
-        if ("LS".equals(containerType)) {
-            LambdaQueryWrapper<Container> lambdaQueryWrapper = Wrappers.lambdaQuery();
-            lambdaQueryWrapper.eq(Container::getCode,containerCode);
-            if (!containerService.remove(lambdaQueryWrapper)){
-                throw new ServiceException("删除临时容器失败");
-            }
-        }
-    }
 }
@@ -1174,6 +1174,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
      * 完成出库任务
      * */
     @Override
+    @Transactional
     public void completeShipmentTask(TaskHeader task) {
         //获取所有子任务
         TaskDetail condition = new TaskDetail();
@@ -1246,6 +1247,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         task.setLastUpdatedBy(ShiroUtils.getLoginName());
         task.setLastUpdated(new Date());
         taskHeaderService.updateById(task);
+
+        //如果是临时容器出库完成后删除容器
+        containerService.removeByCode(task.getContainerCode());
+
         //将库位状态改为空闲，如果是整出的对应的容器也清空
         Location locationRecord = new Location();
         locationRecord.setStatus("empty");