From fb8cf98363fb938311e08c88e175bac71274d5b2 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Sat, 11 May 2024 17:23:20 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/acs/opc/DeviceOpcProtocolRunable.java  |  5 ++--
 .../src/main/resources/log/AcsToLk.xml        |  2 +-
 .../src/main/resources/log/AcsToWms.xml       |  2 +-
 .../resources/log/AgvNdcOneDeviceDriver.xml   |  2 +-
 .../resources/log/AgvNdcTwoDeviceDriver.xml   |  2 +-
 .../src/main/resources/log/AutoCreateInst.xml |  2 +-
 .../src/main/resources/log/LkToAcs.xml        |  2 +-
 .../main/resources/log/NDCAgvServiceImpl.xml  |  2 +-
 .../log/OneNDCSocketConnectionAutoRun.xml     |  2 +-
 .../src/main/resources/log/OpcUtil.xml        |  2 +-
 .../log/TwoNDC2SocketConnectionAutoRun.xml    |  2 +-
 .../log/TwoNDCSocketConnectionAutoRun.xml     |  2 +-
 .../src/main/resources/log/WmsToAcs.xml       |  2 +-
 .../src/main/resources/logback-spring.xml     |  4 ++--
 acs2/nladmin-ui/src/i18n/langs/history/en.js  |  1 +
 acs2/nladmin-ui/src/i18n/langs/history/in.js  |  1 +
 acs2/nladmin-ui/src/i18n/langs/history/zh.js  |  1 +
 .../acs/history/taskTreeRecord/index.vue      |  1 +
 acs2/nladmin-ui/src/views/acs/task/index.vue  | 23 +------------------
 19 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
index 0220ad90f..f6a6afb16 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
@@ -224,6 +224,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
                         random *= 1000;
                         if (this.all_null < 3) {
                             if (log.isWarnEnabled()) {
+                                log.warn(tag + "1重新创建server");
                                 log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null,3);
                             }
 
@@ -231,14 +232,14 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
                             break start;
                         } else if (this.all_null < 6) {
                             if (log.isWarnEnabled()) {
-                                log.warn(tag + "重新创建server");
+                                log.warn(tag + "2重新创建server");
                                 log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null,3);
                             }
                             ThreadUtl.sleep(3000);
                             break start;
                         } else if (this.all_null < 12) {
                             if (log.isWarnEnabled()) {
-                                log.warn(tag + "重新创建server");
+                                log.warn(tag + "3重新创建server");
                                 log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null,3);
                             }
                             ThreadUtl.sleep(3000);
diff --git a/acs/nladmin-system/src/main/resources/log/AcsToLk.xml b/acs/nladmin-system/src/main/resources/log/AcsToLk.xml
index 76f95f2be..986b7f28c 100644
--- a/acs/nladmin-system/src/main/resources/log/AcsToLk.xml
+++ b/acs/nladmin-system/src/main/resources/log/AcsToLk.xml
@@ -10,7 +10,7 @@
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
diff --git a/acs/nladmin-system/src/main/resources/log/AcsToWms.xml b/acs/nladmin-system/src/main/resources/log/AcsToWms.xml
index b7b3978eb..6388f813e 100644
--- a/acs/nladmin-system/src/main/resources/log/AcsToWms.xml
+++ b/acs/nladmin-system/src/main/resources/log/AcsToWms.xml
@@ -10,7 +10,7 @@
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
diff --git a/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml b/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml
index 8abb83afb..ab61b9b7f 100644
--- a/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml
+++ b/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml
@@ -10,7 +10,7 @@
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
diff --git a/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml b/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml
index 60427e421..bc8b49dde 100644
--- a/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml
+++ b/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml
@@ -10,7 +10,7 @@
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
diff --git a/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml b/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml
index 7dda9dfd5..449ee9eb9 100644
--- a/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml
+++ b/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml
@@ -10,7 +10,7 @@
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
diff --git a/acs/nladmin-system/src/main/resources/log/LkToAcs.xml b/acs/nladmin-system/src/main/resources/log/LkToAcs.xml
index 9f827c3d3..d06be707c 100644
--- a/acs/nladmin-system/src/main/resources/log/LkToAcs.xml
+++ b/acs/nladmin-system/src/main/resources/log/LkToAcs.xml
@@ -10,7 +10,7 @@
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
diff --git a/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml b/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml
index 016b46e9c..ede1c7a66 100644
--- a/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml
+++ b/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml
@@ -10,7 +10,7 @@
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
diff --git a/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml b/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml
index ca3f78791..f80c20f81 100644
--- a/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml
+++ b/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml
@@ -10,7 +10,7 @@
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
diff --git a/acs/nladmin-system/src/main/resources/log/OpcUtil.xml b/acs/nladmin-system/src/main/resources/log/OpcUtil.xml
index 63531d7ba..b7234fa2f 100644
--- a/acs/nladmin-system/src/main/resources/log/OpcUtil.xml
+++ b/acs/nladmin-system/src/main/resources/log/OpcUtil.xml
@@ -10,7 +10,7 @@
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
diff --git a/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml b/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml
index 4eec0b7a0..461ac1ac4 100644
--- a/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml
+++ b/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml
@@ -10,7 +10,7 @@
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
diff --git a/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml b/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml
index 4ea34f9f4..650f7cc3b 100644
--- a/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml
+++ b/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml
@@ -10,7 +10,7 @@
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
diff --git a/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml b/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml
index 03c1a31d6..46aade8b0 100644
--- a/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml
+++ b/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml
@@ -10,7 +10,7 @@
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml
index cf9b0947f..347dcd797 100644
--- a/acs/nladmin-system/src/main/resources/logback-spring.xml
+++ b/acs/nladmin-system/src/main/resources/logback-spring.xml
@@ -64,7 +64,7 @@ https://juejin.cn/post/6844903775631572999
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>20GB</totalSizeCap>
         </rollingPolicy>
@@ -117,7 +117,7 @@ https://juejin.cn/post/6844903775631572999
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
+            <maxFileSize>50MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>20GB</totalSizeCap>
         </rollingPolicy>
diff --git a/acs2/nladmin-ui/src/i18n/langs/history/en.js b/acs2/nladmin-ui/src/i18n/langs/history/en.js
index 8234a71ab..d57bafa2f 100644
--- a/acs2/nladmin-ui/src/i18n/langs/history/en.js
+++ b/acs2/nladmin-ui/src/i18n/langs/history/en.js
@@ -7,6 +7,7 @@ export default {
       'Status': 'Status',
       'Priority': 'Task Priority',
       'Starting_point_two': 'Starting Point Two',
+      'Transit_point': 'Transit Point',
       'Endpoint_two': 'Endpoint Two',
       'Material': 'Material',
       'Quantity': 'Quantity',
diff --git a/acs2/nladmin-ui/src/i18n/langs/history/in.js b/acs2/nladmin-ui/src/i18n/langs/history/in.js
index b20a7beac..b0a5ab1d6 100644
--- a/acs2/nladmin-ui/src/i18n/langs/history/in.js
+++ b/acs2/nladmin-ui/src/i18n/langs/history/in.js
@@ -7,6 +7,7 @@ export default {
       'Status': 'Status',
       'Priority': 'Prioritas Tugas',
       'Starting_point_two': 'Titik Awalan Dua',
+      'Transit_point': 'Titik transit',
       'Endpoint_two': 'Titik Akhir Dua',
       'Material': 'Bahan',
       'Quantity': 'Jumlah',
diff --git a/acs2/nladmin-ui/src/i18n/langs/history/zh.js b/acs2/nladmin-ui/src/i18n/langs/history/zh.js
index 2e24ecab9..e332c0678 100644
--- a/acs2/nladmin-ui/src/i18n/langs/history/zh.js
+++ b/acs2/nladmin-ui/src/i18n/langs/history/zh.js
@@ -7,6 +7,7 @@ export default {
       'Status': '状态',
       'Priority': '任务优先级',
       'Starting_point_two': '起点2',
+      'Transit_point': '中转点',
       'Endpoint_two': '终点2',
       'Material': '物料',
       'Quantity': '数量',
diff --git a/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
index 41583bfde..69635b565 100644
--- a/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
@@ -122,6 +122,7 @@
         <el-table-column prop="next_point_code" :label="$t('task.select.Destination')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Destination'))" />
         <el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" :min-width="flexWidth('start_point_code2',crud.data,$t('TaskRecord.table.Starting_point_two'))" />
         <el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" :min-width="flexWidth('next_point_code2',crud.data,$t('TaskRecord.table.Endpoint_two'))" />
+        <el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')" :min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_point'))" />
         <el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" :min-width="flexWidth('matarial',crud.data,$t('TaskRecord.table.Material'))" />
         <el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" :min-width="flexWidth('quantity',crud.data,$t('TaskRecord.table.Quantity'))" />
         <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
diff --git a/acs2/nladmin-ui/src/views/acs/task/index.vue b/acs2/nladmin-ui/src/views/acs/task/index.vue
index 8dea858d5..2cc2345b7 100644
--- a/acs2/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/task/index.vue
@@ -483,7 +483,6 @@
             {{ dict.label.task_type[scope.row.task_type] }}
           </template>
         </el-table-column>
-        <!--        <el-table-column prop="link_num" label="关联编号" />-->
         <el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
         <el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')" width="150px">
           <template slot-scope="scope">
@@ -494,35 +493,15 @@
         </el-table-column>
         <el-table-column prop="priority" :label="$t('task.txt_box.Priority')" :min-width="flexWidth('priority',crud.data,$t('task.txt_box.Priority'))" />
         <el-table-column prop="start_point_code" :label="$t('task.select.Pickup_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Pickup_point'))" />
-        <!--        <el-table-column prop="put_point_code" label="倒料点" width="100" />-->
         <el-table-column prop="next_point_code" :label="$t('task.select.Delivery_point')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Delivery_point'))" />
         <el-table-column prop="start_point_code2" :label="$t('task.select.Start_point2')" :min-width="flexWidth('start_point_code2',crud.data,$t('task.select.Start_point2'))" />
         <el-table-column prop="next_point_code2" :label="$t('task.select.Destination2')" :min-width="flexWidth('next_point_code2',crud.data,$t('task.select.Destination2'))" />
-        <!--        <el-table-column prop="compound_task" label="复合任务">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <span v-if="scope.row.compound_task==='0' ">否</span>-->
-        <!--            <span v-if="scope.row.compound_task==='1' ">是</span>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
-        <!--        <el-table-column prop="compound_task_data" width="200" label="复合路线" />-->
-        <!--        <el-table-column prop="matarial" label="物料" />-->
-        <!--        <el-table-column prop="quantity" label="数量" />-->
+        <el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')" :min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_point'))" />
         <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
         <el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />
         <el-table-column prop="create_time" :label="$t('task.select.Create_time')" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" />
         <el-table-column v-permission="['admin','task:edit','task:del']" :label="$t('task.select.Operation')" width="200px" align="center">
           <template slot-scope="scope">
-            <!--            <el-dropdown trigger="click" @command="handleCommand">-->
-            <!--              <span class="el-dropdown-link">-->
-            <!--                <i class="el-icon-menu" />-->
-            <!--              </span>-->
-            <!--              <el-dropdown-menu slot="dropdown">-->
-            <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">{{ $t('task.select.Completed') }}</el-dropdown-item>-->
-            <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">{{ $t('task.select.Cancel') }}</el-dropdown-item>-->
-            <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">{{ $t('task.select.Create_command') }}</el-dropdown-item>-->
-            <!--              </el-dropdown-menu>-->
-            <!--            </el-dropdown>-->
-            <!--          </template>-->
             <el-dropdown>
               <span class="el-dropdown-link">
                 <i class="el-icon-setting">More</i>