root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
pangshenghao
2023-06-05 13:28:55 +08:00
parent b54501fb43 a3f0c0439a
commit 0370c14d21
2 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
View File

@@ -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);
}

57
lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
View File

@@ -71,10 +71,16 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;"/>
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-select
@@ -128,7 +134,7 @@
</el-select>
</el-form-item>
<el-form-item label="顺序号" prop="sort_seq">
<el-input v-model="form.sort_seq" style="width: 370px;"/>
<el-input v-model="form.sort_seq" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
@@ -143,7 +149,14 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" width="100px" />
<el-table-column prop="vehicle_code" label="载具码" width="140px" />
@@ -194,7 +207,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 +248,7 @@ export default {
},
data() {
return {
permission: {
},
permission: {},
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
@@ -227,13 +256,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()
}