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

feat: 基础搬运任务开发

Browse Source
This commit is contained in:
liyongde
2023-12-01 17:23:50 +08:00
parent a0f8de5245
commit e5cf995af5
63 changed files with 3292 additions and 1987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lms/nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -40,28 +40,41 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， 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-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="820px">
<el-form
ref="form"
:inline="true"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
:model="form"
:rules="rules"
size="mini"
label-width="125px"
label-suffix=":">
<el-form-item label="物料编码">
<el-input v-model="form.material_code" style="width: 370px;" />
<el-input v-model="form.material_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="物料名称 ">
<el-input v-model="form.material_name" style="width: 370px;" />
<el-input v-model="form.material_name" style="width: 240px;" />
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.material_spec" style="width: 370px;" />
<el-input v-model="form.material_spec" style="width: 240px;" />
</el-form-item>
<el-form-item label="物料分类标识">
<el-input v-model="form.class_id" style="width: 370px;" />
<el-form-item label="物料型号">
<el-input v-model="form.material_model" style="width: 240px;" />
</el-form-item>
<el-form-item label="静置时间(分钟)">
<el-input v-model="form.standing_time" style="width: 370px;" />
<el-form-item label="标准数量">
<el-input v-model="form.standard_qty" style="width: 240px;" />
</el-form-item>
<el-form-item label="车间编码">
<el-input v-model="form.workshop_code" style="width: 370px;" />
<el-form-item label="工艺号">
<el-input v-model="form.technique_num" style="width: 240px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
<el-input v-model="form.remark" type="textarea" style="width: 240px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -123,6 +136,9 @@ const defaultForm = {
material_code: null,
material_name: null,
material_spec: null,
material_model: null,
standard_qty: null,
technique_num: null,
class_id: null,
standing_time: null,
workshop_code: null,

6
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -247,16 +247,16 @@
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<!-- <el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')" /> -->
<el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')" />
<el-table-column prop="point_status_name" label="点位状态" :min-width="flexWidth('point_status_name',crud.data,'点位类型')" />
<!-- <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />-->
<!-- <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />-->
<!-- <el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位状态')" />-->
<!-- <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 30)">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column> -->
<el-table-column prop="vehicle_type" label="物料类型" :min-width="flexWidth('vehicle_type',crud.data,'物料类型')" />
<!-- <el-table-column prop="vehicle_type" label="物料类型" :min-width="flexWidth('vehicle_type',crud.data,'物料类型')" />-->
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
<el-table-column label="是否锁定" :min-width="flexWidth('vehicle_qty',crud.data,'是否锁定')">

7
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -160,6 +160,7 @@
<!--表格渲染-->
<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="task_id" label="任务ID" :min-width="flexWidth('task_id',crud.data,'任务编码')" />
<el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
<el-table-column prop="vehicle_code" label="载具编码1" :min-width="flexWidth('vehicle_code',crud.data,'载具编码1')">
<template slot-scope="scope">
@@ -183,6 +184,8 @@
<el-table-column prop="point_code2" label="终点1" :min-width="flexWidth('point_code2',crud.data,'点位2')" />
<el-table-column prop="point_code3" label="起点2" :min-width="flexWidth('point_code3',crud.data,'点位3')" />
<el-table-column prop="point_code4" label="终点2" :min-width="flexWidth('point_code4',crud.data,'点位4')" />
<el-table-column prop="start_wait_point" label="取货等待点" :min-width="flexWidth('start_wait_point',crud.data,'取货等待点')" />
<el-table-column prop="next_wait_point" label="放货等待点" :min-width="flexWidth('next_wait_point',crud.data,'放货等待点')" />
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 20)">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
@@ -260,6 +263,8 @@ const defaultForm = {
point_code2: null,
point_code3: null,
point_code4: null,
start_wait_point: null,
next_wait_point: null,
vehicle_type: null,
vehicle_qty: null,
vehicle_code: null,
@@ -358,7 +363,7 @@ export default {
return
}
const data = {
task_id: row.task_id,
task_code: row.task_code,
method_name: method_name,
config_code: row.config_code
}