From 0b4e68961f05506c17a9ebe6a845b318560bf540 Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Wed, 19 Apr 2023 10:01:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=98=89=E8=80=90=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/application.yml    |  2 +-
 .../pdm/service/impl/ProducetaskServiceImpl.java |  2 +-
 .../src/main/resources/logback-spring.xml        |  4 ++--
 wms/qd/src/views/wms/sch/point/index.vue         | 16 ++++++++--------
 wms/qd/src/views/wms/sch/task/index.vue          |  4 ++--
 .../src/views/wms/st/buss/vehiclegroup/index.vue |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/acs/hd/nladmin-system/src/main/resources/config/application.yml b/acs/hd/nladmin-system/src/main/resources/config/application.yml
index 8e1be36..07d277e 100644
--- a/acs/hd/nladmin-system/src/main/resources/config/application.yml
+++ b/acs/hd/nladmin-system/src/main/resources/config/application.yml
@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data:
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java
index 860be48..0668987 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java
@@ -299,7 +299,7 @@ public class ProducetaskServiceImpl implements ProducetaskService {
     String producetask_id = param.getString("producetask_id");
     WQLObject wo = WQLObject.getWQLObject("pdm_mg_producetask");
     JSONObject map = new JSONObject();
-    map.put("producetask_status", "99");
+    map.put("producetask_status", "05");
     map.put("producetask_finish_type", "02");
     param.put("update_optid", currentUserId);
     param.put("update_optname", nickName);
diff --git a/wms/hd/nladmin-system/src/main/resources/logback-spring.xml b/wms/hd/nladmin-system/src/main/resources/logback-spring.xml
index fcd64c2..c4506c9 100644
--- a/wms/hd/nladmin-system/src/main/resources/logback-spring.xml
+++ b/wms/hd/nladmin-system/src/main/resources/logback-spring.xml
@@ -63,7 +63,7 @@ https://juejin.cn/post/6844903775631572999
         <root level="debug">
             <appender-ref ref="CONSOLE"/>
         </root>
-        <!--<logger name="org.springframework" level="ERROR" additivity="false">
+        <logger name="org.springframework" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
         <logger name="org.hibernate" level="ERROR" additivity="false">
@@ -95,7 +95,7 @@ https://juejin.cn/post/6844903775631572999
         </logger>
         <logger name="nl.basjes" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
-        </logger>-->
+        </logger>
     </springProfile>
     <!--测试环境:打印控制台-->
     <springProfile name="test">
diff --git a/wms/qd/src/views/wms/sch/point/index.vue b/wms/qd/src/views/wms/sch/point/index.vue
index e748262..fdec03d 100644
--- a/wms/qd/src/views/wms/sch/point/index.vue
+++ b/wms/qd/src/views/wms/sch/point/index.vue
@@ -157,13 +157,13 @@
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
           <el-form-item label="点位编码" prop="point_code">
-            <el-input v-model="form.point_code" style="width: 370px;" />
+            <el-input disabled v-model="form.point_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="点位名称" prop="point_name">
-            <el-input v-model="form.point_name" style="width: 370px;" />
+            <el-input disabled v-model="form.point_name" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="所属区域" prop="area_type">
-            <el-select v-model="form.area_type" filterable placeholder="请选择" style="width: 370px;">
+            <el-select disabled v-model="form.area_type" filterable placeholder="请选择" style="width: 370px;" >
               <el-option
                 v-for="item in dict.sch_area_type"
                 :key="item.value"
@@ -172,11 +172,11 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="点位类型" prop="point_type">
+          <!--<el-form-item  v-if='false' label="点位类型" prop="point_type">
             <el-radio v-for="item in dict.sch_point_type" :key="item.id" v-model="form.point_type" :label="item.value">
               {{ item.label }}
             </el-radio>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="点位状态" prop="point_status">
             <el-select v-model="form.point_status" filterable placeholder="请选择" style="width: 370px;">
               <el-option
@@ -265,12 +265,12 @@
           </template>
         </el-table-column>
         <el-table-column prop="vehicle_code" label="载具编码" min-width="150" show-overflow-tooltip/>
-        <el-table-column prop="device_name" label="所属设备" min-width="110" show-overflow-tooltip />
-        <el-table-column prop="device_point_type" label="设备点位类型" width="120px">
+<!--        <el-table-column prop="device_name" label="所属设备" min-width="110" show-overflow-tooltip />-->
+        <!--<el-table-column prop="device_point_type" label="设备点位类型" width="120px">
           <template slot-scope="scope">
             {{ dict.label.sch_device_point_type[scope.row.device_point_type] }}
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
         <el-table-column prop="is_used" label="是否启用">
           <template slot-scope="scope">
diff --git a/wms/qd/src/views/wms/sch/task/index.vue b/wms/qd/src/views/wms/sch/task/index.vue
index 58a80a9..2c5ad3d 100644
--- a/wms/qd/src/views/wms/sch/task/index.vue
+++ b/wms/qd/src/views/wms/sch/task/index.vue
@@ -135,7 +135,7 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="task_code" label="任务编码" min-width="120" show-overflow-tooltip/>
+        <el-table-column prop="task_code" label="任务编码" min-width="150" show-overflow-tooltip/>
         <el-table-column prop="task_type" label="任务类型" width="100">
           <template slot-scope="scope">
             {{ dict.label.sch_task_type[scope.row.task_type] }}
@@ -158,7 +158,7 @@
             {{ dict.label.task_finished_type[scope.row.finished_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="remark" label="备注" width="120" />
+        <el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip/>
         <el-table-column prop="create_name" label="创建人" />
         <el-table-column prop="create_time" label="创建时间" width="150px" />
         <el-table-column prop="update_optname" label="修改人" />
diff --git a/wms/qd/src/views/wms/st/buss/vehiclegroup/index.vue b/wms/qd/src/views/wms/st/buss/vehiclegroup/index.vue
index cd41215..e3296b6 100644
--- a/wms/qd/src/views/wms/st/buss/vehiclegroup/index.vue
+++ b/wms/qd/src/views/wms/st/buss/vehiclegroup/index.vue
@@ -48,7 +48,7 @@
       <el-table-column type="selection" width="55" />
       <el-table-column v-if="false" prop="group_id" label="组盘标识" />
       <el-table-column prop="vehicle_code" label="托盘编码" />
-      <el-table-column prop="material_code" label="物料编码" />
+      <el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip/>
       <el-table-column prop="material_name" label="物料名称 " />
       <el-table-column prop="pcsn" label="批次" />
       <el-table-column prop="qty" label="数量" />