From 2e8e9be3decaf388fb5109e88214b76f249ec70c Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Sun, 5 Feb 2023 18:41:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java | 3 +++
acs/nladmin-ui/src/views/acs/instruction/index.vue | 4 ++--
acs/nladmin-ui/src/views/acs/task/index.vue | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java
index c9cead3e5..942392c4d 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java
@@ -124,6 +124,9 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
if(StrUtil.equals(task.getTask_type(),"7") && StrUtil.equals(task.getStorage_task_type(),"4")){
inst.setInstruction_status("2");
instructionService.finish(inst.getInstruction_id());
+ } else {
+ inst.setRemark("立库已反馈完成，待输送上报任务号");
+ instructionService.update(inst);
}
} else if(StrUtil.equals(status,"4")){
diff --git a/acs/nladmin-ui/src/views/acs/instruction/index.vue b/acs/nladmin-ui/src/views/acs/instruction/index.vue
index 92eb8a07f..49d8b8f97 100644
--- a/acs/nladmin-ui/src/views/acs/instruction/index.vue
+++ b/acs/nladmin-ui/src/views/acs/instruction/index.vue
@@ -157,8 +157,8 @@
-
-
+
+
diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue
index 8afc0cce2..7b7d4dd47 100644
--- a/acs/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs/nladmin-ui/src/views/acs/task/index.vue
@@ -353,8 +353,8 @@
-
-
+
+