代码更新

nladmin-system/src/main/java/org/nl/wms/sch/TaskTypeEnum.java

@@ -0,0 +1,49 @@
+package org.nl.wms.sch;
+
+/**
+ * 任务状态枚举
+ */
+public enum TaskTypeEnum {
+    //生箔任务
+    SB_QKFM("sb_qkfm", "生箔取空放满","生箔取空放满"),
+    SB_QK("sb_qk", "生箔取空","生箔取空"),
+    SB_FM("sb_qk", "生箔放满","生箔放满"),
+
+    //分切上料任务
+    FQ_SL_QMFK("fq_sl_qmfk", "分切取满放空","分切放满"),
+    FQ_SL_FM("fq_sl_fm", "分切放满","分切初始化"),
+    FQ_SL_QK("fq_sl_qk", "分切取满放空","分切放满"),
+
+    //分切下料任务
+    FQ_XL_CZ("FQ_XL_QK", "子卷出站","子卷出站4个点"),
+
+    //烘箱
+    //入烘箱:3个点
+    //输送任务。
+    HX_R_QMFMFM("hx_r_qmfmfm", "入烘箱","入烘箱3个点"),
+    HX_C_SS("hx_c_ss", "出烘箱输送线","出烘箱输送线"),
+    HX_C_AGV("hx_c_agv", "出烘箱AGV","出烘箱AGV");
+
+
+
+
+
+    private String code;
+    private String name;
+    private String description;
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    TaskTypeEnum(String code, String name,String description) {
+        this.code = code;
+        this.name = name;
+        this.description = description;
+    }
+
+}

nladmin-system/src/main/java/org/nl/wms/sch/manage/TaskTypeEnum.java

@@ -1,33 +0,0 @@
-package org.nl.wms.sch.manage;
-
-/**
- * 任务状态枚举
- */
-public enum TaskTypeEnum {
-    IN_TASK(1, "01", "入库"),
-    Out_TASK(2, "02", "出库"),
-    IN_EMPTY_VEHICLE_TASK(3, "03", "入空载具"),
-    OUT_EMPTY_VEHICLE_TASK(4, "04", "出空载具"),
-    DUMPINV_TASK(5, "05", "转储"),
-    QUALITY_TASK(6, "06", "质检"),
-    MATERIAL_BACK_TASK(7, "07", "余料回库");
-
-    private int index;
-    private String code;
-    private String name;
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    TaskTypeEnum(int index, String code, String name) {
-        this.index = index;
-        this.code = code;
-        this.name = name;
-    }
-
-}

nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java

@@ -13,7 +13,7 @@ import org.nl.wms.sch.manage.FinishTypeEnum;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.sch.service.TaskService;
 import org.nl.wms.sch.service.dto.TaskDto;
-import org.nl.wms.sch.manage.TaskTypeEnum;
+import org.nl.wms.sch.TaskTypeEnum;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

nladmin-system/src/main/resources/logback-spring.xml

@@ -66,7 +66,7 @@ https://juejin.cn/post/6844903775631572999
         </http>
         <format>
             <label>
-                <pattern>system=${SYSTEM_NAME},level=%level,logType=%X{log_file_type:-logType},device=%X{device_code_log:-device}</pattern>
+                <pattern>system=${SYSTEM_NAME},level=%level,logType=%X{log_file_type:-logType}</pattern>
             </label>
             <message>
                 <pattern>${log.pattern}</pattern>

nladmin-ui/package.json

@@ -45,7 +45,7 @@
     "echarts": "^4.2.1",
     "echarts-gl": "^1.1.1",
     "echarts-wordcloud": "^1.1.3",
-    "element-ui": "^2.13.2",
+    "element-ui": "^2.15.8",
     "file-saver": "1.3.8",
     "font-awesome": "^4.7.0",
     "fuse.js": "3.4.4",

nladmin-ui/src/views/system/timing/log.vue

@@ -27,7 +27,7 @@
           <el-tag :type="scope.row.isSuccess ? 'success' : 'danger'">{{ scope.row.isSuccess ? '成功' : '失败' }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column show-overflow-tooltip prop="createTime" label="创建日期">
+      <el-table-column min-width="100" show-overflow-tooltip prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>