From 5e13feaab1fc181d92ce7fac7601eb2912416d38 Mon Sep 17 00:00:00 2001
From: youjie <j.you@huahengweld.com>
Date: Tue, 11 May 2021 08:40:24 +0800
Subject: [PATCH] 取消空托出库查看时，需要解锁库位、容器
---
src/main/java/com/huaheng/pc/config/container/service/ContainerService.java | 2 ++
src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java | 9 +++++++++
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java | 2 +-
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java | 2 +-
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java b/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java
index 2b7b65d..8586c04 100644
--- a/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java
+++ b/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java
@@ -23,6 +23,8 @@ public interface ContainerService extends IService<Container>{
*/
void updateLocationCodeAndStatus(String containerCode, String locationCode, String status);
+ boolean updateStatus(String containerCode, String status);
+
void removeContainer(String containType, String containCode);
Container findAllByCode(String containCode);
diff --git a/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java b/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
index e3146ac..d13896c 100644
--- a/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
@@ -137,6 +137,15 @@ public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container
}
}
+ @Override
+ public boolean updateStatus(String containerCode, String status) {
+ LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
+ containerLambdaQueryWrapper.eq(Container::getCode, containerCode);
+ Container container = getOne(containerLambdaQueryWrapper);
+ boolean result = update(container, containerLambdaQueryWrapper);
+ return result;
+ }
+
/**
* 如果为临时容器，在取消组盘和出库任务完成时删除容器
* @param containerType 容器类型
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java
index 3fcd4e2..510092a 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java
@@ -12,7 +12,7 @@ import java.util.Date;
@ApiModel(value="com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader")
@TableName(value = "shipment_container_header")
-public class ShipmentContainerHeader implements Serializable {
+public class ShipmentContainerHeader implements Serializable {
/**
* 出库箱内部号
*/
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
index f844919..1eec6d6 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
@@ -534,7 +534,7 @@ public class WorkTaskService {
if(taskHeaderService.save(taskHeader)){
//锁定库位状态
locationService.updateStatus(locationCode,"lock");
- containerService.updateLocationCodeAndStatus(conCode, "", "lock");
+ containerService.updateStatus(containerCode, "lock");
} else {
throw new ServiceException("空托出库主表生成失败！");
}
--
libgit2 0.22.2