lyd/liaoninghexing
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

rev: 分拣工单、分拣木托盘搬运校验根据计算好的数量

Browse Source
This commit is contained in:
liyongde
2023-10-23 18:30:38 +08:00
parent ff1c809fd8
commit 22deece58f
23 changed files with 530 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue Normal file
View File

@@ -0,0 +1,143 @@
<template>
<el-dialog
title="选择包装订单"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="1000px"
@close="close"
@open="open"
>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
size="mini"
border
:cell-style="{'text-align':'center'}"
:header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
@select="handleSelectionChange"
@select-all="onSelectAll"
@current-change="clickChange"
>
<el-table-column v-if="!isSingle" type="selection" width="55" />
<el-table-column v-if="isSingle" label="选择" width="55">
<template slot-scope="scope">
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template>
</el-table-column>
<el-table-column prop="FORDER_NO" label="订单号" width="160" />
<el-table-column prop="FORDER_SUBNUM" label="总数量" width="160" />
<el-table-column prop="GUADANSUM" label="包装数量" width="160" />
<el-table-column prop="FMATERIAL_NAME" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="FMATSPEC" label="物料规格" width="140" />
<el-table-column prop="FMATMODEL" label="物料型号" width="130px" />
</el-table>
<!--分页组件-->
<pagination />
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
</span>
</el-dialog>
</template>
<script>
import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default {
name: 'ProductionOrder',
components: { rrOperation, pagination },
dicts: ['is_used'],
cruds() {
return CRUD({
title: '包装订单',
url: 'api/pdmBdWorkorder/mesOrder',
optShow: {},
query: {
material_code: null
}
})
},
mixins: [presenter(), header()],
props: {
dialogShow: {
type: Boolean,
default: false
},
isSingle: {
type: Boolean,
default: true
},
materialCode: {
type: String,
default: null
}
},
data() {
return {
dialogVisible: false,
tableRadio: null,
tableData: []
}
},
watch: {
dialogShow: {
handler(newValue) {
this.dialogVisible = newValue
}
}
},
methods: {
clickChange(item) {
this.tableRadio = item
},
open() {
this.crud.query.materialId = this.materialCode
this.crud.toQuery()
},
handleSelectionChange(val, row) {
if (val.length > 1) {
this.$refs.table.clearSelection()
this.$refs.table.toggleRowSelection(val.pop())
} else {
this.checkrow = row
}
},
onSelectAll() {
this.$refs.table.clearSelection()
},
close() {
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
},
submit() {
// 处理单选
if (this.isSingle && this.tableRadio) {
this.$emit('update:dialogShow', false)
this.$emit('recordMesOrder', this.tableRadio)
return
}
this.rows = this.$refs.table.selection
if (this.rows.length <= 0) {
this.$message('请先勾选订单')
return
}
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
this.$emit('recordMesOrder', this.rows)
}
}
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-dialog__body {
padding-top: 0px;
}
</style>

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

@@ -37,8 +37,8 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="crud.toQuery">
</el-date-picker>
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="工单状态">
<el-select
@@ -60,7 +60,7 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" >
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
@@ -123,8 +123,9 @@
<el-form-item label="物料规格">
<el-input v-model="form.material_spec" style="width: 240px;" disabled />
</el-form-item>
<el-form-item label="计划数量" prop="plan_qty">
<el-form-item label="计划数量" prop="plan_qty" >
<el-input-number
:disabled="form.region_code === 'FJ'"
v-model.number="form.plan_qty"
:min="0"
style="width: 240px;"
@@ -154,7 +155,7 @@
placeholder="选择日期时间"
/>
</el-form-item>
<el-form-item label="实际开始时间" v-if="crud.status.edit">
<el-form-item v-if="crud.status.edit" label="实际开始时间">
<el-date-picker
v-model="form.realproducestart_date"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -163,7 +164,7 @@
placeholder="选择日期时间"
/>
</el-form-item>
<el-form-item label="实际结束时间" v-if="crud.status.edit">
<el-form-item v-if="crud.status.edit" label="实际结束时间">
<el-date-picker
v-model="form.realproduceend_date"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -216,6 +217,27 @@
<el-form-item label="设备名称">
<el-input v-model="form.point_name" style="width: 240px;" disabled />
</el-form-item>
<el-form-item v-if="form.region_code === 'FJ'" label="订单号">
<el-input
v-model="form.order_no"
:disabled="form.material_code===null"
style="width: 240px;"
@focus="getProductionOrder(form.material_id)"
/>
</el-form-item>
<el-form-item v-if="form.region_code === 'FJ'" label="客户编码">
<el-select v-model="form.custer_no" placeholder="请选择" style="width: 240px;">
<el-option
v-for="item in custerList"
:key="item.CUSTER_NO"
:label="item.CUSTER_NAME"
:value="item.CUSTER_NO"
>
<span style="float: left">{{ item.CUSTER_NO }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.CUSTER_NAME }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="静置时间(分钟)" prop="standing_time">
<el-input-number
v-model.number="form.standing_time"
@@ -224,7 +246,7 @@
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="实际数量" prop="real_qty" v-if="crud.status.edit">
<el-form-item v-if="crud.status.edit" label="实际数量" prop="real_qty">
<el-input-number
v-model.number="form.real_qty"
:min="0"
@@ -278,7 +300,11 @@
@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="workorder_code"
label="工单编号"
:min-width="flexWidth('workorder_code',crud.data,'工单编号')"
/>
<el-table-column
prop="workorder_status"
label="工单状态"
@@ -290,21 +316,53 @@
</el-table-column>
<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="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="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_code" label="设备编码" :min-width="flexWidth('point_code',crud.data,'设备编码')" />
<el-table-column prop="point_name" label="设备名称" :min-width="flexWidth('point_name',crud.data,'设备名称')" />
<el-table-column prop="material_code" label="成品编码" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
<el-table-column prop="half_material_code" label="半成品编码" :min-width="flexWidth('half_material_code',crud.data,'半成品编码')" />
<el-table-column prop="raw_material_code" label="泥料编码" :min-width="flexWidth('raw_material_code',crud.data,'物料标识')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料标识')" />
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 20)">
<el-table-column
prop="material_code"
label="成品编码"
:min-width="flexWidth('material_name',crud.data,'物料标识')"
/>
<el-table-column
prop="half_material_code"
label="半成品编码"
:min-width="flexWidth('half_material_code',crud.data,'半成品编码')"
/>
<el-table-column
prop="raw_material_code"
label="泥料编码"
:min-width="flexWidth('raw_material_code',crud.data,'物料标识')"
/>
<el-table-column
prop="material_name"
label="物料名称"
:min-width="flexWidth('material_name',crud.data,'物料标识')"
/>
<el-table-column
prop="material_spec"
label="物料规格"
:min-width="flexWidth('material_spec',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] }}
</template>
</el-table-column>
<el-table-column prop="produce_date" label="生产日期" :min-width="flexWidth('produce_date',crud.data,'生产日期')"/>
<el-table-column
prop="produce_date"
label="生产日期"
:min-width="flexWidth('produce_date',crud.data,'生产日期')"
/>
<el-table-column
prop="planproducestart_date"
label="计划开始时间"
@@ -330,7 +388,11 @@
label="静置时间(分钟)"
:min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')"
/>
<el-table-column prop="is_needmove" label="是否自动搬运" :min-width="flexWidth('is_needmove',crud.data,'是否自动搬运')">
<el-table-column
prop="is_needmove"
label="是否自动搬运"
:min-width="flexWidth('is_needmove',crud.data,'是否自动搬运')"
>
<template slot-scope="scope">
{{ scope.row.is_needmove ? '是' : '否' }}
</template>
@@ -340,17 +402,25 @@
{{ scope.row.is_urgent ? '是' : '否' }}
</template>
</el-table-column>
<!-- <el-table-column prop="workorder_type" label="工单类型" :min-width="flexWidth('workorder_type',crud.data,'工单类型')" />-->
<!-- <el-table-column prop="workorder_type" label="工单类型" :min-width="flexWidth('workorder_type',crud.data,'工单类型')" />-->
<!--<el-table-column
prop="passback_status"
label="回传MES状态"
:min-width="flexWidth('passback_status',crud.data,'回传MES状态')"
/>-->
<!-- <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->
<!-- <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',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,'创建时间')" />
<el-table-column
prop="create_time"
label="创建时间"
:min-width="flexWidth('create_time',crud.data,'创建时间')"
/>
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column
prop="update_time"
label="修改时间"
:min-width="flexWidth('update_time',crud.data,'修改时间')"
/>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -363,12 +433,13 @@
<!--分页组件-->
<pagination />
</div>
<MaterialDialog :dialog-show.sync="materialDialog" @tableChanged="tableChanged" :flag="flag"/>
<MaterialDialog :dialog-show.sync="materialDialog" :flag="flag" @tableChanged="tableChanged" />
<ProductionOrder :dialog-show.sync="orderDialog" :material-code="materialCode" @recordMesOrder="recordMesOrder" />
</div>
</template>
<script>
import crudPdmBdWorkorder, { orderSynchronize } from './pdmBdWorkorder'
import crudPdmBdWorkorder from './pdmBdWorkorder'
import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
@@ -379,7 +450,7 @@ import pagination from '@crud/Pagination'
import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
import MaterialDialog from '@/views/wms/sch/group/MaterialDialog.vue'
import item from '@/layout/components/Sidebar/Item.vue'
import crudMdBaseMaterial from '@/views/wms/basedata/material/mdBaseMaterial'
import ProductionOrder from '@/views/wms/pdm/workerorder/ProductionOrder.vue'
const defaultForm = {
workorder_id: null,
@@ -409,12 +480,17 @@ const defaultForm = {
workshop_code: null,
ext_id: null,
is_delete: false,
is_urgent: false
is_urgent: false,
order_no: null,
custer_no: null,
pack_method: null,
order_subnum: 0,
guadansum: 0
}
export default {
name: 'PdmBdWorkorder',
dicts: ['vehicle_type', 'pdm_workorder_status'],
components: { MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
components: { ProductionOrder, MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -458,14 +534,18 @@ export default {
workShopList: [],
regionList: [],
pointList: [],
custerList: [],
regionCodeParam: null,
materialDialog: false,
orderDialog: false,
materialCode: null,
flag: 1
}
},
created() {
this.getWorkShopList()
this.getRegionList()
this.getCuster()
},
methods: {
item() {
@@ -488,6 +568,11 @@ export default {
this.regionList = res
})
},
getCuster() { // 获取客户信息
crudPdmBdWorkorder.getCuster().then(res => {
this.custerList = res
})
},
getPointList() { // 获取点位列表
if (this.regionCodeParam) {
const param = {
@@ -503,6 +588,10 @@ export default {
this.materialDialog = true
this.flag = flag
},
getProductionOrder(code) {
this.orderDialog = true
this.materialCode = code
},
tableChanged(row, flag) {
if (flag === 1) {
this.form.material_name = row.material_name
@@ -511,12 +600,24 @@ export default {
this.form.material_code = row.material_code
this.form.half_material_code = row.half_material_code
this.form.raw_material_code = row.raw_material_code
this.form.pack_method = row.pack_method
} else {
this.form.raw_material_name = row.material_name
this.form.raw_material_id = row.material_id
this.form.raw_material_code = row.material_code
}
},
clearRecordMesOrder() {
this.form.order_no = null
this.form.order_subnum = 0
this.form.guadansum = 0
},
recordMesOrder(row) { // 操作mes工单
this.clearRecordMesOrder()
this.form.order_no = row.FORDER_NO
this.form.order_subnum = row.FORDER_SUBNUM
this.form.guadansum = row.GUADANSUM
},
setRegionName(data) {
// 清空
this.form.point_code = null

8
lms/nladmin-ui/src/views/wms/pdm/workerorder/pdmBdWorkorder.js
View File

@@ -48,5 +48,11 @@ export function queryMaterials(data) {
data
})
}
export function getCuster() {
return request({
url: 'api/pdmBdWorkorder/getCuster',
method: 'post'
})
}
export default { add, edit, del, submits, orderSynchronize, queryMaterials }
export default { add, edit, del, submits, orderSynchronize, queryMaterials, getCuster }

2
lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
View File

@@ -54,7 +54,6 @@
<el-table-column prop="raw_material_code" label="泥料编码" width="160" />
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="140" />
<!-- <el-table-column prop="class_name" label="物料分类" width="140" />-->
<el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
<el-table-column prop="update_name" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="135" />
@@ -69,7 +68,6 @@
</template>
<script>
import crudWorkOrder from '@/views/wms/pdm/workerorder/pdmBdWorkorder'
import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'