wms / wms_wuhangelinmei · Commits

Commit 5e13feaab1fc181d92ce7fac7601eb2912416d38

Authored by 游杰
1 parent 74e42866

取消空托出库查看时，需要解锁库位、容器

Inline Side-by-side
Showing 4 changed files with 13 additions and 2 deletions
src/main/java/com/huaheng/pc/config/container/service/ContainerService.java
  View file @5e13fea
... ... @@ -23,6 +23,8 @@ public interface ContainerService extends IService<Container>{
23 23 */
24 24 void updateLocationCodeAndStatus(String containerCode, String locationCode, String status);
25 25  
  26 + boolean updateStatus(String containerCode, String status);
  27 +
26 28 void removeContainer(String containType, String containCode);
27 29  
28 30 Container findAllByCode(String containCode);
... ...
src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
  View file @5e13fea
... ... @@ -137,6 +137,15 @@ public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container
137 137 }
138 138 }
139 139  
  140 + @Override
  141 + public boolean updateStatus(String containerCode, String status) {
  142 + LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
  143 + containerLambdaQueryWrapper.eq(Container::getCode, containerCode);
  144 + Container container = getOne(containerLambdaQueryWrapper);
  145 + boolean result = update(container, containerLambdaQueryWrapper);
  146 + return result;
  147 + }
  148 +
140 149 /**
141 150 * 如果为临时容器，在取消组盘和出库任务完成时删除容器
142 151 * @param containerType 容器类型
... ...
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java
  View file @5e13fea
... ... @@ -12,7 +12,7 @@ import java.util.Date;
12 12  
13 13 @ApiModel(value="com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader")
14 14 @TableName(value = "shipment_container_header")
15   -public class ShipmentContainerHeader implements Serializable {
  15 +public class ShipmentContainerHeader implements Serializable {
16 16 /**
17 17 * 出库箱内部号
18 18 */
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
  View file @5e13fea
... ... @@ -534,7 +534,7 @@ public class WorkTaskService {
534 534 if(taskHeaderService.save(taskHeader)){
535 535 //锁定库位状态
536 536 locationService.updateStatus(locationCode,"lock");
537   - containerService.updateLocationCodeAndStatus(conCode, "", "lock");
  537 + containerService.updateStatus(containerCode, "lock");
538 538 } else {
539 539 throw new ServiceException("空托出库主表生成失败！");
540 540 }
... ...