From 2b10d99301d70d406d0a02f8a47e03d5558613f0 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Mon, 5 Jun 2023 10:09:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?rev:=E6=96=B0=E5=A2=9E=E6=A0=A1=E9=AA=8C?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81=E4=B8=BA=E7=A9=BA=E8=BD=BD?=
=?UTF-8?q?=E5=85=B7=E8=BD=BD=E5=85=B7=E5=AD=97=E6=AE=B5=E4=B8=8D=E8=83=BD?=
=?UTF-8?q?=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/nl/wms/sch/tasks/CutTrussTask.java | 4 +-
.../wms/pdm/ivt/deliverypointivt/index.vue | 68 +++++++++++++------
2 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
index 41a0ae863..0979d143b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
@@ -220,8 +220,8 @@ public class CutTrussTask extends AbstractAcsTask {
form.put("point_code1", jsonTask.getString("point_code1"));
JSONObject ss_jo = WQLObject.getWQLObject("sch_base_point").query("product_area = '" + delivery_point.getString("product_area") + "' AND point_type = '7'").uniqueResult(0);
form.put("point_code2", ss_jo.getString("point_code"));
- form.put("vehiclie_code", jsonTask.getString("vehicle_code2"));
- form.put("vehiclie_code2", delivery_point.getString("vehicle_code"));
+ form.put("vehicle_code", jsonTask.getString("vehicle_code2"));
+ form.put("vehicle_code2", delivery_point.getString("vehicle_code"));
form.put("task_type", "010401");
cutConveyorTask.createTask(form);
}
diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
index 77fb844ad..9babebd24 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
@@ -65,13 +65,14 @@
@change="hand"
/>
-
+
-
+
-
+
@@ -92,10 +93,10 @@
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
{{ dict.label.delivery_point_status[scope.row.point_status] }}
@@ -168,8 +170,8 @@
{{ dict.label.is_used[scope.row.is_used] }}
-
-
+
+
-
+
@@ -194,7 +196,24 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
-const defaultForm = { ivt_id: null, point_code: null, product_area: null, qzzno: null, vehicle_code: null, point_status: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
+const defaultForm = {
+ ivt_id: null,
+ point_code: null,
+ product_area: null,
+ qzzno: null,
+ vehicle_code: null,
+ point_status: null,
+ point_location: null,
+ sort_seq: null,
+ is_used: null,
+ remark: null,
+ create_id: null,
+ create_name: null,
+ create_time: null,
+ update_optid: null,
+ update_optname: null,
+ update_time: null
+}
export default {
name: 'DeliveryPointIvt',
components: { pagination, crudOperation, rrOperation, udOperation },
@@ -218,8 +237,7 @@ export default {
},
data() {
return {
- permission: {
- },
+ permission: {},
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
@@ -227,13 +245,25 @@ export default {
is_used: [
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
]
- }}
+ }
+ }
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
+ [CRUD.HOOK.beforeSubmit]() {
+ debugger
+ if (this.form.point_status !== '01' && !this.form.vehicle_code) {
+ this.crud.notify('请输入载具编码！', CRUD.NOTIFICATION_TYPE.INFO)
+ return false
+ }
+ if ((this.form.point_status === '03' || this.form.point_status === '04') && !this.form.qzzno) {
+ this.crud.notify('请输入气涨轴编码！', CRUD.NOTIFICATION_TYPE.INFO)
+ return false
+ }
+ },
hand(value) {
this.crud.toQuery()
}
From a3f0c0439a95432e03d030a3f603cc2a3a7a910c Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Mon, 5 Jun 2023 10:10:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wms/pdm/ivt/deliverypointivt/index.vue | 49 ++++++++++++-------
1 file changed, 30 insertions(+), 19 deletions(-)
diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
index 9babebd24..d76f43831 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
@@ -65,17 +65,22 @@
@change="hand"
/>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
{{ dict.label.delivery_point_status[scope.row.point_status] }}
@@ -170,8 +181,8 @@
{{ dict.label.is_used[scope.row.is_used] }}
-
-
+
+
-
+