From 5ac422d89a50a35a4654012d608cbfc4aa916145 Mon Sep 17 00:00:00 2001
From: xumiao <1365304440@qq.com>
Date: Wed, 4 Jan 2023 13:51:27 +0800
Subject: [PATCH] edit
---
src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java | 7 +++++++
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java b/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
index 455231d..858413c 100644
--- a/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
+++ b/src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
@@ -880,6 +880,13 @@ public class AcsServiceImpl extends ServiceImpl<AcsMapper,AgvTask> implements Ac
agvPortService.setContainerCode(task.getToPort(),null);
iAgvInventoryService.removeByPortCode(task.getFromPort());
}
+ try {
+ if(task.getToPort().equals("Work 830")){
+ inventoryHeaderService.createEmptyIn(task.getContainerCode(), null);
+ }
+ }catch (Exception e) {
+ e.printStackTrace();
+ }
cancelContainerStatus(task);
}
if(o3.equals(QuantityConstant.STATUS_TASK_ERROR)){
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 d18d8e6..e1bf011 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
@@ -104,7 +104,7 @@ public class WorkTaskService {
}
if (StringUtils.isNotEmpty(receiptPreferences.get(0).getEmptyLocRule())) {
LambdaQueryWrapper<FilterConfigDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
- lambdaQueryWrapper.eq(FilterConfigDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
+ lambdaQueryWrapper.eq(FilterConfigDetail::getWarehouseCode, "CS0001")
.eq(FilterConfigDetail::getCode, receiptPreferences.get(0).getEmptyLocRule());
FilterConfigDetail filterConfigDetail = filterConfigDetailService.getOne(lambdaQueryWrapper);
if (StringUtils.isNull(filterConfigDetail)) {
@@ -142,7 +142,7 @@ public class WorkTaskService {
//创建主任务
TaskHeader taskHeader = new TaskHeader();
- taskHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
+ taskHeader.setWarehouseCode("CS0001");
taskHeader.setTaskType(QuantityConstant.TASK_TYPE_EMPTYRECEIPT);
taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_RECEIPT);
Location location = locationService.getLocationByCode(destinationLocation);
--
libgit2 0.22.2