From 2189e5aa750bec5312dee826a3e9a464295acb2e Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 8 Aug 2023 18:00:54 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E5=8E=BB=E9=99=A4=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SysInteractRecordServiceImpl.java       |  4 ++--
 .../nl/wms/sch/task_manage/AutoCreateTask.java   |  4 ----
 lms/nladmin-ui/src/views/wms/sch/group/index.vue | 16 ++++++++--------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java
index 885ba31..037e763 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java
@@ -116,13 +116,13 @@ public class SysInteractRecordServiceImpl extends ServiceImpl<SysInteractRecordM
         entity.setDirection(direction);
         entity.setRequest_param(JSONObject.toJSONString(request));
         entity.setResponse_param(JSONObject.toJSONString(response));
-        if (response instanceof BaseResponse) {
+        if (response instanceof BaseResponse) { // acs请求wms的返回数据
             BaseResponse re = (BaseResponse) response;
             entity.setCode(re.getCode());
             entity.setMessage(re.getMessage());
             entity.setIs_success(re.getCode() == HttpStatus.HTTP_OK);
         }
-        if (response instanceof ResultForAcs) {
+        if (response instanceof ResultForAcs) { // wms请求acs的返回数据
             ResultForAcs re = (ResultForAcs) response;
             entity.setCode(re.getStatus());
             entity.setMessage(re.getMessage());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java
index fa9e62b..42e5c63 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java
@@ -39,10 +39,6 @@ public class AutoCreateTask {
             // 调用AbstractAcsTask类的每个子类的schedule()方法
             try {
                 Object obj = SpringContextHolder.getBean(clz);
-//                if (ObjectUtil.isEmpty(obj)) { // 如果spring中获取不到，就用newInstance创建
-//                    obj = clz.newInstance();
-//                }
-                //Method m = obj.getClass().getDeclaredMethod("schedule");
                 Method m = obj.getClass().getMethod("schedule");
                 m.invoke(obj);
             } catch (InvocationTargetException e) {
diff --git a/lms/nladmin-ui/src/views/wms/sch/group/index.vue b/lms/nladmin-ui/src/views/wms/sch/group/index.vue
index 7468302..3a3e59c 100644
--- a/lms/nladmin-ui/src/views/wms/sch/group/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/group/index.vue
@@ -198,12 +198,12 @@
           <el-form-item label="流程顺序">
             <el-input v-model="form.flow_num" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="上一任务">
-            <el-input v-model="form.before_task_code" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="下一任务">
-            <el-input v-model="form.next_task_code" style="width: 240px;" />
-          </el-form-item>
+<!--          <el-form-item label="上一任务">-->
+<!--            <el-input v-model="form.before_task_code" style="width: 240px;" />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="下一任务">-->
+<!--            <el-input v-model="form.next_task_code" style="width: 240px;" />-->
+<!--          </el-form-item>-->
           <el-form-item label="备注" prop="remark">
             <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
             <el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
@@ -256,8 +256,8 @@
         <!--        <el-table-column prop="flow_num" label="流程顺序" :min-width="flexWidth('flow_num',crud.data,'流程顺序')"/>-->
         <el-table-column prop="into_kiln_time" label="入窑时间" :min-width="flexWidth('into_kiln_time',crud.data,'上一任务')" />
         <el-table-column prop="out_kiln_time" label="出窑时间" :min-width="flexWidth('out_kiln_time',crud.data,'上一任务')" />
-        <el-table-column prop="before_task_code" label="上一任务" :min-width="flexWidth('before_task_code',crud.data,'上一任务')" />
-        <el-table-column prop="next_task_code" label="下一任务" :min-width="flexWidth('next_task_code',crud.data,'上一任务')" />
+<!--        <el-table-column prop="before_task_code" label="上一任务" :min-width="flexWidth('before_task_code',crud.data,'上一任务')" />-->
+<!--        <el-table-column prop="next_task_code" label="下一任务" :min-width="flexWidth('next_task_code',crud.data,'上一任务')" />-->
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
         <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />