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

rev 混料机下工单依旧使用物料号

Browse Source
This commit is contained in:
张江玮
2023-05-18 17:51:18 +08:00
parent aefd73c951
commit 01b9073569
19 changed files with 367 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-ui/src/views/wms/basedata/bom/index.vue
View File

@@ -10,11 +10,11 @@
label-width="90px"
label-suffix="："
>
<el-form-item label="BOM编码">
<el-form-item label="物料编码">
<el-input
v-model="query.name"
clearable
placeholder="BOM编码"
placeholder="物料编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>

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

@@ -35,17 +35,80 @@
<el-row>
<el-col :span="12">
<el-form-item label="物料编码" prop="material_code">
<el-input :disabled="crud.status.edit" v-model="form.material_code" clearable style="width: 300px" />
<el-input v-model="form.material_code" :disabled="crud.status.edit" clearable style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="单重" prop="weight">
<el-form-item label="订单编码" prop="order_code">
<el-input v-model="form.order_code" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="部位" prop="product_grade">
<el-input v-model="form.product_grade" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="炉型" prop="furnace">
<el-input v-model="form.furnace" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="砖型" prop="brick_type">
<el-input v-model="form.brick_type" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="类别" prop="material_brick_type">
<el-input v-model="form.material_brick_type" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="订单单重" prop="weight">
<el-input v-model="form.weight" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">千克</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="订单数量" prop="aux_qty">
<el-input v-model="form.aux_qty" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">块</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="订单重量" prop="qty">
<el-input v-model="form.qty" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">千克</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="困料时间" prop="standing_time">
<el-input v-model="form.standing_time" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="超时时间" prop="threshold_time">
<el-input v-model="form.threshold_time" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="产品编号" prop="product_code">
@@ -97,7 +160,21 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="weight" label="单重" :min-width="flexWidth('weight',crud.data,'单重')" />
<el-table-column prop="order_code" label="订单编码" :min-width="flexWidth('order_code',crud.data,'订单编码')" />
<el-table-column prop="product_grade" label="部位" :min-width="flexWidth('weight',crud.data,'部位')" />
<el-table-column prop="furnace" label="炉型" :min-width="flexWidth('furnace',crud.data,'炉型')" />
<el-table-column prop="brick_type" label="砖型" :min-width="flexWidth('brick_type',crud.data,'砖型')" />
<el-table-column prop="material_brick_type" label="类别" :min-width="flexWidth('material_brick_type',crud.data,'类别')" />
<el-table-column prop="weight" label="订单单重" :min-width="flexWidth('weight',crud.data,'订单单重')" />
<el-table-column prop="aux_qty" label="订单数量" :min-width="flexWidth('aux_qty',crud.data,'订单数量')" />
<el-table-column prop="qty" label="订单重量" :min-width="flexWidth('qty',crud.data,'订单重量')" />
<el-table-column prop="current_aux_qty" label="完成数量" :min-width="flexWidth('current_aux_qty',crud.data,'完成数量')" />
<el-table-column prop="unqualified_qty" label="废砖数量" :min-width="flexWidth('unqualified_qty',crud.data,'废砖数量')" />
<el-table-column prop="current_qty" label="完成总重" :min-width="flexWidth('current_qty',crud.data,'完成总重')" />
<el-table-column prop="surplus_aux_qty" label="剩余数量" :min-width="flexWidth('surplus_aux_qty',crud.data,'剩余数量')" />
<el-table-column prop="surplus_qty" label="剩余重量" :min-width="flexWidth('surplus_qty',crud.data,'剩余重量')" />
<el-table-column prop="standing_time" label="困料时间" :min-width="flexWidth('standing_time',crud.data,'困料时间')" />
<el-table-column prop="threshold_time" label="超时时间" :min-width="flexWidth('threshold_time',crud.data,'超时时间')" />
<el-table-column prop="product_code" label="产品编号" :min-width="flexWidth('product_code',crud.data,'产品编号')" />
<el-table-column prop="a" label="长边长度" :min-width="flexWidth('a',crud.data,'长边长度')" />
<el-table-column prop="b" label="短边长度" :min-width="flexWidth('b',crud.data,'短边长度')" />
@@ -159,7 +236,14 @@ const defaultForm = {
update_optname: null,
update_time: null,
weight: null,
material_type: '1'
material_type: '1',
order_code: null,
product_grade: null,
material_brick_type: null,
furnace: null,
qty: 0,
aux_qty: 0,
brick_type: null
}
export default {
name: 'Materialbase',

30
lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue
View File

@@ -20,11 +20,11 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="BOM编码">
<el-form-item label="物料编码">
<el-input
v-model="query.material"
clearable
placeholder="BOM编码"
placeholder="物料编码"
style="width: 200px;"
@keyup.enter.native="crud.toQuery"
/>
@@ -103,7 +103,7 @@
<el-form-item label="生产设备" prop="device_name">
<el-input
v-model="form.device_name"
:disabled="crud.status.edit"
:disabled="form.order_status > '1'"
style="width: 300px"
clearable
@focus="deviceShow=true"
@@ -114,13 +114,13 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="BOM编码" prop="material_code">
<el-form-item label="物料编码" prop="material_code">
<el-input
v-model="form.material_code"
:disabled="crud.status.edit"
:disabled="form.order_status > '1'"
style="width: 300px"
clearable
@focus="bomShow=true"
@focus="materialShow=true"
@clear="form.material_id=''; form.material_code=''; form.material_name=''"
/>
</el-form-item>
@@ -129,7 +129,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="计划重量" prop="plan_qty">
<el-input v-model="form.plan_qty" :disabled="crud.status.edit" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">千克</i></el-input>
<el-input v-model="form.plan_qty" :disabled="form.order_status > '1'" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">千克</i></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -143,9 +143,9 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="是否新料" prop="is_new">
<el-radio v-model="form.is_new" :disabled="crud.status.edit" label="1">是</el-radio>
<el-radio v-model="form.is_new" :disabled="crud.status.edit" label="0">否</el-radio>
<el-form-item label="是否正品料" prop="is_new">
<el-radio v-model="form.is_new" :disabled="form.order_status > '1'" label="1">是</el-radio>
<el-radio v-model="form.is_new" :disabled="form.order_status > '1'" label="0">否</el-radio>
</el-form-item>
</el-col>
</el-row>
@@ -177,7 +177,7 @@
</template>
</el-table-column>
<el-table-column prop="device_name" label="设备" :min-width="flexWidth('device_name',crud.data,'设备')" />
<el-table-column prop="material_code" label="BOM编码" :min-width="flexWidth('material_code',crud.data,'BOM编码')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="plan_qty" label="计划重量" :min-width="flexWidth('plan_qty',crud.data,'计划数量/重量')" />
<el-table-column prop="is_urgent" label="是否加急" :min-width="flexWidth('is_urgent',crud.data,'是否加急')">
<template slot-scope="scope">
@@ -209,7 +209,7 @@
<pagination />
</div>
<DeviceDialog :dialog-show.sync="deviceShow" :is-single="true" @tableChanged="tableChanged" />
<BOMDtl :dialog-show.sync="bomShow" :is-single="true" @setBOMValue="setBOMValue" />
<MaterDtl :dialog-show.sync="materialShow" :is-single="true" @setMaterValue="setMaterValue" />
<ViewDialog ref="child3" />
<!--表单组件-->
<el-dialog
@@ -248,7 +248,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import ViewDialog from '@/views/wms/pdm/workerorder/ViewDialog'
import DeviceDialog from '@/views/wms/pub/DeviceDialog'
import BOMDtl from '@/views/wms/pub/BOMDialog.vue'
import MaterDtl from '@/views/wms/pub/MaterDialog.vue'
const defaultForm = {
workorder_id: null,
@@ -299,7 +299,7 @@ const defaultForm = {
}
export default {
name: 'HLWorkorder',
components: { BOMDtl, pagination, crudOperation, rrOperation, udOperation, ViewDialog, DeviceDialog },
components: { MaterDtl, pagination, crudOperation, rrOperation, udOperation, ViewDialog, DeviceDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['pdm_workorder_status', 'priority_direction', 'is_used', 'is_or_not', 'material_type', 'vehicle_type', 'workorder_procedure', 'true_or_false', 'wood_vehicle_type'],
cruds() {
@@ -413,7 +413,7 @@ export default {
this.form.device_name = row.device_name
this.form.region_code = row.region_code
},
setBOMValue(row) {
setMaterValue(row) {
this.form.material_id = row.material_id
this.form.material_code = row.material_code
},

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

@@ -230,7 +230,7 @@
<pagination />
</div>
<MaterDtl :dialog-show.sync="materialShow" :is-single="true" @setMaterValue="setMaterValue" />
<DeviceDialog :dialog-show.sync="deviceShow" :is-single="true" :region-str="'(\'YZ\', \'FJ\')'" @tableChanged="tableChanged" />
<DeviceDialog :dialog-show.sync="deviceShow" :is-single="true" :region-str="'(\'YZ\')'" @tableChanged="tableChanged" />
<ViewDialog ref="child3" />
<!--表单组件-->
<el-dialog

2
lms/nladmin-ui/src/views/wms/pub/BOMDialog.vue
View File

@@ -78,7 +78,7 @@ export default {
crudMethod: { ...crudMaterialbase },
optShow: {},
query: {
material_type: '2'
material_type: '1'
}
})
},

24
lms/nladmin-ui/src/views/wms/pub/MaterDialog.vue
View File

@@ -23,6 +23,22 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="订单编码">
<el-input
v-model="query.order_code"
clearable
placeholder="订单编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="部位">
<el-input
v-model="query.product_grade"
clearable
placeholder="部位"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
@@ -46,11 +62,9 @@
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="product_code" label="产品编号" :min-width="flexWidth('product_code',crud.data,'产品编号')" />
<el-table-column prop="a" label="长边长度" :min-width="flexWidth('a',crud.data,'长边长度')" />
<el-table-column prop="b" label="短边长度" :min-width="flexWidth('b',crud.data,'短边长度')" />
<el-table-column prop="h" label="梯形高度" :min-width="flexWidth('w',crud.data,'梯形高度')" />
<el-table-column prop="w" label="砖块厚度" :min-width="flexWidth('h',crud.data,'砖块厚度')" />
<el-table-column prop="order_code" label="订单编码" :min-width="flexWidth('order_code',crud.data,'订单编码')" />
<el-table-column prop="product_grade" label="部位" :min-width="flexWidth('product_grade',crud.data,'部位')" />
<el-table-column prop="brick" label="砖型" :min-width="flexWidth('brick',crud.data,'砖型')" />
</el-table>
<!--分页组件-->
<pagination />

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

@@ -265,7 +265,7 @@
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="material_code" label="物料编码/BOM编码" :min-width="flexWidth('material_code',crud.data,'物料编码/BOM编码')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" show-overflow-tooltip />
<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,'创建时间')" />