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 @@ - + - + - + - + - - - - - + + + + + - - + + @@ -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() }