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
-
+
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 @@
>
-
+
-
+
-
+
-
+
-
-
+
+
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"
>
-
+
{{ dict.label.sch_task_type[scope.row.task_type] }}
@@ -158,7 +158,7 @@
{{ dict.label.task_finished_type[scope.row.finished_type] }}
-
+
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 @@
-
+