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

Merge branch 'master' of http://121.40.234.130:8899/root/stand_lms

Browse Source
This commit is contained in:
liyongde
2023-05-16 18:54:27 +08:00
parent 14f2eb236d b0f65ad31f
commit 12fc701a56
36 changed files with 268 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -18,9 +18,6 @@
<el-form-item label="工单编号">
<el-input v-model="form.workorder_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="生产日期">
<el-input v-model="form.produce_date" style="width: 240px;" />
</el-form-item>
<el-form-item label="计划数量">
<el-input v-model="form.plan_qty" style="width: 240px;" />
</el-form-item>
@@ -79,7 +76,6 @@
<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="workorder_code" label="工单编号" :min-width="flexWidth('workorder_code',crud.data,'工单编号')"/>
<el-table-column prop="produce_date" label="生产日期" :min-width="flexWidth('produce_date',crud.data,'生产日期')"/>
<el-table-column prop="plan_qty" label="计划数量" :min-width="flexWidth('plan_qty',crud.data,'计划数量')"/>
<el-table-column prop="real_qty" label="实际数量" :min-width="flexWidth('real_qty',crud.data,'实际数量')"/>
<el-table-column prop="material_id" label="物料标识" :min-width="flexWidth('material_id',crud.data,'物料标识')"/>
@@ -128,7 +124,6 @@ import pagination from '@crud/Pagination'
const defaultForm = {
workorder_id: null,
workorder_code: null,
produce_date: null,
plan_qty: null,
real_qty: null,
material_id: null,

27
nladmin-ui/src/views/wms/sch/region/index.vue
View File

@@ -35,14 +35,6 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="是否建工单">
<el-switch
v-model="query.is_has_workder"
active-color="#409EFF"
inactive-color="#C0CCDA"
@change="hand"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
@@ -75,6 +67,18 @@
<el-form-item label="区域名称">
<el-input v-model="form.region_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="顺序号">
<label slot="label">顺序号</label>
<el-input-number
v-model="form.order_seq"
:controls="true"
:precision="0"
:min="0"
:step="1"
style="width: 370px"
/>
</el-form-item>
<el-form-item label="点位类型说明">
<el-input v-model="form.point_type_explain" style="width: 370px;" />
</el-form-item>
@@ -118,6 +122,7 @@
</template>
</el-table-column>
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<el-table-column prop="order_seq" label="顺序号" :min-width="flexWidth('order_seq',crud.data,'顺序号')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
@@ -154,6 +159,7 @@ const defaultForm = {
point_status_explain: null,
is_has_workder: 'true',
workshop_code: null,
order_seq: 0,
remark: null
}
export default {
@@ -167,10 +173,7 @@ export default {
url: 'api/schBaseRegion',
idField: 'region_code',
sort: 'region_code,desc',
crudMethod: { ...crudSchBaseRegion },
query: {
is_has_workder: true
}
crudMethod: { ...crudSchBaseRegion }
})
},
created() {

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

@@ -5,85 +5,82 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， 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="800px">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
<el-form-item label="任务编码">
<el-input v-model="form.task_code" style="width: 370px;" />
<el-input v-model="form.task_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="任务分类">
<el-input v-model="form.task_class_id" style="width: 370px;" />
<el-input v-model="form.task_class_id" style="width: 240px;" />
</el-form-item>
<el-form-item label="任务状态">
<el-input v-model="form.task_status" style="width: 370px;" />
<el-input v-model="form.task_status" style="width: 240px;" />
</el-form-item>
<el-form-item label="配置编码">
<el-input v-model="form.config_code" style="width: 370px;" />
<el-input v-model="form.config_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="点位1">
<el-input v-model="form.point_code1" style="width: 370px;" />
<el-input v-model="form.point_code1" style="width: 240px;" />
</el-form-item>
<el-form-item label="点位2">
<el-input v-model="form.point_code2" style="width: 370px;" />
<el-input v-model="form.point_code2" style="width: 240px;" />
</el-form-item>
<el-form-item label="点位3">
<el-input v-model="form.point_code3" style="width: 370px;" />
<el-input v-model="form.point_code3" style="width: 240px;" />
</el-form-item>
<el-form-item label="点位4">
<el-input v-model="form.point_code4" style="width: 370px;" />
<el-input v-model="form.point_code4" style="width: 240px;" />
</el-form-item>
<el-form-item label="载具类型">
<el-input v-model="form.vehicle_type" style="width: 370px;" />
<el-input v-model="form.vehicle_type" style="width: 240px;" />
</el-form-item>
<el-form-item label="载具数量">
<el-input v-model="form.vehicle_qty" style="width: 370px;" />
<el-input v-model="form.vehicle_qty" style="width: 240px;" />
</el-form-item>
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
<el-input v-model="form.vehicle_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="优先级">
<el-input v-model="form.priority" style="width: 370px;" />
<el-input v-model="form.priority" style="width: 240px;" />
</el-form-item>
<el-form-item label="处理类">
<el-input v-model="form.handle_class" style="width: 370px;" />
<el-form-item v-if="false" label="处理类">
<el-input v-model="form.handle_class" style="width: 240px;" />
</el-form-item>
<el-form-item label="处理状态">
<el-input v-model="form.handle_status" style="width: 370px;" />
<el-input v-model="form.handle_status" style="width: 240px;" />
</el-form-item>
<el-form-item label="车号">
<el-input v-model="form.car_no" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否自动下发">
<el-input v-model="form.is_auto_issue" style="width: 370px;" />
<el-input v-model="form.car_no" style="width: 240px;" />
</el-form-item>
<el-form-item label="任务组标识">
<el-input v-model="form.task_group_id" style="width: 370px;" />
<el-input v-model="form.task_group_id" style="width: 240px;" />
</el-form-item>
<el-form-item label="任务组顺序号">
<el-input v-model="form.task_group_seq" style="width: 370px;" />
<el-input v-model="form.task_group_seq" style="width: 240px;" />
</el-form-item>
<el-form-item label="任务完成类型">
<el-input v-model="form.finished_type" style="width: 370px;" />
<el-input v-model="form.finished_type" style="width: 240px;" />
</el-form-item>
<el-form-item label="生成方式">
<el-input v-model="form.create_mode" style="width: 370px;" />
<el-input v-model="form.create_mode" style="width: 240px;" />
</el-form-item>
<el-form-item label="链路标识">
<el-input v-model="form.acs_trace_id" style="width: 370px;" />
<el-input v-model="form.acs_trace_id" style="width: 240px;" />
</el-form-item>
<el-form-item label="生成任务的请求参数">
<el-input v-model="form.request_param" style="width: 370px;" />
<el-form-item v-if="false" label="生成任务的请求参数">
<el-input v-model="form.request_param" style="width: 240px;" />
</el-form-item>
<el-form-item label="下发任务的请求参数">
<el-input v-model="form.response_param" style="width: 370px;" />
<el-input v-model="form.response_param" style="width: 240px;" />
</el-form-item>
<el-form-item label="车间编码">
<el-input v-model="form.workshop_code" style="width: 370px;" />
<el-input v-model="form.workshop_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="额外组盘信息">
<el-input v-model="form.ext_group_data" style="width: 370px;" />
<el-input v-model="form.ext_group_data" 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" style="width: 240px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -106,10 +103,9 @@
<el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')"/>
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')"/>
<el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')"/>
<el-table-column prop="handle_class" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')"/>
<el-table-column prop="handle_class" v-if="false" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')"/>
<el-table-column prop="handle_status" label="处理状态" :min-width="flexWidth('handle_status',crud.data,'处理状态')"/>
<el-table-column prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')"/>
<el-table-column prop="is_auto_issue" label="是否自动下发" :min-width="flexWidth('is_auto_issue',crud.data,'是否自动下发')"/>
<el-table-column prop="task_group_id" label="任务组标识" :min-width="flexWidth('task_group_id',crud.data,'任务组标识')"/>
<el-table-column prop="task_group_seq" label="任务组顺序号" :min-width="flexWidth('task_group_seq',crud.data,'任务组顺序号')"/>
<el-table-column prop="finished_type" label="任务完成类型" :min-width="flexWidth('finished_type',crud.data,'任务完成类型')"/>
@@ -163,7 +159,6 @@ const defaultForm = {
handle_class: null,
handle_status: null,
car_no: null,
is_auto_issue: null,
task_group_id: null,
task_group_seq: null,
finished_type: null,