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

更新

Browse Source
This commit is contained in:
gengby
2022-08-04 19:47:16 +08:00
parent f0fbf69345
commit 7cb9051a20
18 changed files with 228 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mes/qd/src/views/wms/mps/produce/AddDialog.vue
View File

@@ -119,6 +119,16 @@
/>
</template>
</el-table-column>
<el-table-column prop="planproduceend_date" label="计划结束时间" align="center" width="250px">
<template slot-scope="scope">
<el-date-picker
v-model="scope.row.planproduceend_date"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
style="width: 200px;"
/>
</template>
</el-table-column>
<el-table-column prop="sale_id" label="销售单标识" align="center" width="150px">
<template scope="scope">
<el-input v-model="scope.row.sale_id"/>
@@ -146,9 +156,14 @@
</el-radio>
</template>
</el-table-column>
<el-table-column prop="orderNum" label="订单数量" align="center" width="150px">
<template scope="scope">
<el-input v-model="scope.row.orderNum" type="number" :min="1" oninput="value = value.replace(/[^\d]/g, '')" style="width: 200px;"/>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button type="text" @click="cancle">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="submit">确认</el-button>
</div>
<MaterDtl
@@ -197,8 +212,12 @@ export default {
}
},
methods: {
cancle() {
this.$emit('update:dialogShow', false)
},
insertDtl() {
const date = this.dateFormatter(new Date())
const formatter1 = this.dateFormatter1(new Date())
this.tableData.push({
produceorder_id: '',
produceorder_code: '',
@@ -213,7 +232,7 @@ export default {
material_code: '',
material_weight: '',
planproducestart_date: date,
planproduceend_date: '',
planproduceend_date: formatter1,
realproducestart_date: '',
realproduceend_date: '',
order_status: '00',
@@ -223,7 +242,8 @@ export default {
device_id: '',
is_canupdate_update: '1',
material_spec: '',
sale_id: ''
sale_id: '',
orderNum: 1
})
},
open() {
@@ -256,12 +276,14 @@ export default {
const year = d.getFullYear()
const month = (d.getMonth() + 1) < 10 ? '0' + (d.getMonth() + 1) : (d.getMonth() + 1)
const day = d.getDate() < 10 ? '0' + d.getDate() : d.getDate()
debugger
if (val === '02') {
row.planproducestart_date = [year, month, day].join('-') + ' ' + ['18', '30', '00'].join(':')
const day1 = d.getDate() < 10 ? '0' + (d.getDate() + 1) : d.getDate() + 1
row.planproduceend_date = [year, month, day1].join('-') + ' ' + ['07', '30', '00'].join(':')
}
if (val === '01') {
row.planproducestart_date = [year, month, day].join('-') + ' ' + ['07', '30', '00'].join(':')
row.planproduceend_date = [year, month, day].join('-') + ' ' + ['18', '30', '00'].join(':')
}
this.tableData.splice(index, 1, row)
},
@@ -283,6 +305,13 @@ export default {
const day = d.getDate() < 10 ? '0' + d.getDate() : d.getDate()
return [year, month, day].join('-') + ' ' + ['07', '30', '00'].join(':')
},
dateFormatter1(str) {
const d = new Date(str)
const year = d.getFullYear()
const month = (d.getMonth() + 1) < 10 ? '0' + (d.getMonth() + 1) : (d.getMonth() + 1)
const day = d.getDate() < 10 ? '0' + d.getDate() : d.getDate()
return [year, month, day].join('-') + ' ' + ['18', '30', '00'].join(':')
},
deleteRow(index, rows) {
rows.splice(index, 1)
},
@@ -312,6 +341,7 @@ export default {
}
crudProduceshiftorder.addRows(this.tableData)
this.$emit('update:dialogShow', false)
this.$emit('AddChanged')
}
}
}

191
mes/qd/src/views/wms/mps/produce/index.vue
View File

@@ -118,7 +118,7 @@
class="filter-item"
/>
</el-form-item>
<rrOperation :crud="crud"/>
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -150,8 +150,8 @@
type="success"
icon="el-icon-position"
size="mini"
:disabled="is_disabled(crud.selections.length,crud.selections[0])"
@click="submits(crud.selections[0])"
:disabled="is_disabled(crud.selections)"
@click="submits(crud.selections)"
>
下发
</el-button>
@@ -203,10 +203,10 @@
</el-select>
</el-form-item>
<el-form-item label="生产日期" prop="produce_date">
<el-date-picker v-model="form.produce_date" type="date" value-format="yyyy-MM-dd" style="width: 200px;"/>
<el-date-picker v-model="form.produce_date" type="date" value-format="yyyy-MM-dd" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="false" label="物料标识" prop="material_id">
<el-input v-model="form.material_id" style="width: 200px;"/>
<el-input v-model="form.material_id" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<el-input
@@ -232,10 +232,10 @@
/>
</el-form-item>
<el-form-item label="物料单重" prop="material_weight">
<el-input v-model="form.material_weight" style="width: 200px;"/>
<el-input v-model="form.material_weight" style="width: 200px;" />
</el-form-item>
<el-form-item label="计划数量" prop="plan_qty">
<el-input v-model="form.plan_qty" style="width: 200px;"/>
<el-input v-model="form.plan_qty" style="width: 200px;" />
</el-form-item>
<el-form-item label="计划开始时间" prop="planproducestart_date">
<el-date-picker
@@ -254,10 +254,10 @@
/>
</el-form-item>
<el-form-item v-if="crud.status.edit" label="报工数量" prop="report_qty">
<el-input v-model="form.report_qty" style="width: 200px;"/>
<el-input v-model="form.report_qty" style="width: 200px;" />
</el-form-item>
<el-form-item v-if="crud.status.edit" label="实际数量" prop="report_qty">
<el-input v-model="form.real_qty" style="width: 200px;"/>
<el-input v-model="form.real_qty" style="width: 200px;" />
</el-form-item>
<el-form-item label="班次类型" prop="shift_type_scode">
<el-select
@@ -265,6 +265,7 @@
style="width: 200px"
clearable
filterable
@change="change"
placeholder="请选择"
>
<el-option
@@ -276,7 +277,7 @@
</el-select>
</el-form-item>
<el-form-item label="销售单标识">
<el-input v-model="form.sale_id" style="width: 200px;"/>
<el-input v-model="form.sale_id" style="width: 200px;" />
</el-form-item>
<el-form-item label="是否搬运" prop="is_needmove">
<el-radio
@@ -297,6 +298,10 @@
>{{ item.label }}
</el-radio>
</el-form-item>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<el-form-item label="工单数量" prop="orderNum">
<el-input v-model="form.orderNum" type="number" :min="1" oninput="value = value.replace(/[^\d]/g, '')" style="width: 200px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -312,14 +317,14 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column v-if="false" prop="produceorder_id" label="生产班次工单标识"/>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="produceorder_id" label="生产班次工单标识" />
<el-table-column prop="produceorder_code" label="工单编号" width="140px">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="producedeviceorder_code" label="机台工单号" width="100px"/>
<el-table-column prop="producedeviceorder_code" label="机台工单号" width="100px" />
<el-table-column prop="order_status" label="工单状态">
<template slot-scope="scope">
{{ dict.label.MPS_BD_ORDERSTATUS[scope.row.order_status] }}
@@ -330,22 +335,25 @@
{{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="workprocedure_id" label="工序标识"/>
<el-table-column prop="produce_date" label="生产日期" width="100px"/>
<el-table-column prop="plan_qty" label="计划数量"/>
<el-table-column prop="real_qty" label="实际数量"/>
<el-table-column prop="report_qty" label="报工数量"/>
<el-table-column v-if="false" prop="material_id" label="物料标识"/>
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip/>
<el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip/>
<el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip/>
<el-table-column prop="sale_id" label="销售单标识" width="100" show-overflow-tooltip/>
<el-table-column prop="class_name" label="产品系列" width="100" show-overflow-tooltip/>
<el-table-column prop="material_weight" label="物料单重" :formatter="rounding"/>
<el-table-column prop="planproducestart_date" label="计划生产开始时间" width="150"/>
<el-table-column prop="planproduceend_date" label="计划生产结束时间" width="150"/>
<el-table-column prop="realproducestart_date" label="实际生产开始时间" width="150"/>
<el-table-column prop="realproduceend_date" label="实际生产结束时间" width="150"/>
<el-table-column v-if="false" prop="workprocedure_id" label="工序标识" />
<el-table-column prop="produce_date" label="生产日期" width="100px" />
<el-table-column prop="device_code" label="设备编码" />
<el-table-column prop="device_name" label="设备名称" />
<el-table-column prop="jockey_name" label="操作工" />
<el-table-column prop="plan_qty" label="计划数量" />
<el-table-column prop="real_qty" label="实际数量" />
<el-table-column prop="report_qty" label="报工数量" />
<el-table-column v-if="false" prop="material_id" label="物料标识" />
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
<el-table-column prop="sale_id" label="销售单标识" width="100" show-overflow-tooltip />
<el-table-column prop="class_name" label="产品系列" width="100" show-overflow-tooltip />
<el-table-column prop="material_weight" label="物料单重" :formatter="rounding" />
<el-table-column prop="planproducestart_date" label="计划生产开始时间" width="150" />
<el-table-column prop="planproduceend_date" label="计划生产结束时间" width="150" />
<el-table-column prop="realproducestart_date" label="实际生产开始时间" width="150" />
<el-table-column prop="realproduceend_date" label="实际生产结束时间" width="150" />
<el-table-column prop="is_needmove" label="是否搬运">
<template slot-scope="scope">
{{ dict.label.IS_OR_NOT[scope.row.is_needmove] }}
@@ -356,10 +364,10 @@
{{ dict.label.PDM_BI_ORDERTYPE[scope.row.order_type_scode] }}
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人"/>
<el-table-column prop="create_time" label="创建时间" width="150"/>
<el-table-column prop="update_optname" label="修改人"/>
<el-table-column prop="update_time" label="修改时间" width="150"/>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150" />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -370,7 +378,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
<MaterDtl
:dialog-show.sync="materialShow"
@@ -378,21 +386,21 @@
:mater-opt-code="materType"
@setMaterValue="setMaterValue"
/>
<ViewDialog ref="child3"/>
<AddDialog :dialog-show.sync="addShow" @AddChanged="querytable"/>
<ViewDialog ref="child3" />
<AddDialog :dialog-show.sync="addShow" @AddChanged="querytable" />
</div>
</template>
<script>
import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
import CRUD, {presenter, header, form, crud} from '@crud/crud'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import ViewDialog from '@/views/wms/mps/produce/ViewDialog'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
@@ -431,11 +439,12 @@ const defaultForm = {
device_id: null,
is_canupdate_update: '1',
material_spec: null,
sale_id: null
sale_id: null,
orderNum: 1
}
export default {
name: 'Produceshiftorder',
components: {AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog},
components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
cruds() {
@@ -451,7 +460,7 @@ export default {
query: {
order_status: '-1'
},
crudMethod: {...crudProduceshiftorder}
crudMethod: { ...crudProduceshiftorder }
})
},
data() {
@@ -465,40 +474,40 @@ export default {
permission: {},
rules: {
produceorder_code: [
{required: true, message: '生产班次工单编号不能为空', trigger: 'blur'}
{ required: true, message: '生产班次工单编号不能为空', trigger: 'blur' }
],
producedeviceorder_code: [
{required: true, message: '机台工单号不能为空', trigger: 'blur'}
{ required: true, message: '机台工单号不能为空', trigger: 'blur' }
],
shift_type_scode: [
{required: true, message: '班次类型不能为空', trigger: 'blur'}
{ required: true, message: '班次类型不能为空', trigger: 'blur' }
],
workprocedure_id: [
{required: true, message: '工序标识不能为空', trigger: 'blur'}
{ required: true, message: '工序标识不能为空', trigger: 'blur' }
],
produce_date: [
{required: true, message: '生产日期不能为空', trigger: 'blur'}
{ required: true, message: '生产日期不能为空', trigger: 'blur' }
],
plan_qty: [
{required: true, message: '计划数量不能为空', trigger: 'blur'}
{ required: true, message: '计划数量不能为空', trigger: 'blur' }
],
material_code: [
{required: true, message: '物料编码不能为空', trigger: 'change'}
],
planproducestart_date: [
{required: true, message: '计划生产开始时间不能为空', trigger: 'blur'}
{ required: true, message: '物料编码不能为空', trigger: 'change' }
],
order_status: [
{required: true, message: '工单状态不能为空', trigger: 'blur'}
{ required: true, message: '工单状态不能为空', trigger: 'blur' }
],
is_needmove: [
{required: true, message: '是否搬运不能为空', trigger: 'blur'}
{ required: true, message: '是否搬运不能为空', trigger: 'blur' }
],
order_type_scode: [
{required: true, message: '工单类型不能为空', trigger: 'blur'}
{ required: true, message: '工单类型不能为空', trigger: 'blur' }
],
orderNum: [
{ required: true, message: '生成工单数量不能为空', trigger: 'blur' }
],
is_canupdate_update: [
{required: true, message: '不能为空', trigger: 'blur'}
{ required: true, message: '不能为空', trigger: 'blur' }
]
}
}
@@ -508,6 +517,42 @@ export default {
this.initClass3()
},
methods: {
initDataPlan() {
const date = this.dateFormatter(new Date())
const formatter1 = this.dateFormatter1(new Date())
this.form.planproducestart_date = date
this.form.planproduceend_date = formatter1
this.form.produce_date = date
},
change(val) {
const d = new Date()
const year = d.getFullYear()
const month = (d.getMonth() + 1) < 10 ? '0' + (d.getMonth() + 1) : (d.getMonth() + 1)
const day = d.getDate() < 10 ? '0' + d.getDate() : d.getDate()
if (val === '02') {
this.form.planproducestart_date = [year, month, day].join('-') + ' ' + ['18', '30', '00'].join(':')
const day1 = d.getDate() < 10 ? '0' + (d.getDate() + 1) : d.getDate() + 1
this.form.planproduceend_date = [year, month, day1].join('-') + ' ' + ['07', '30', '00'].join(':')
}
if (val === '01') {
this.form.planproducestart_date = [year, month, day].join('-') + ' ' + ['07', '30', '00'].join(':')
this.form.planproduceend_date = [year, month, day].join('-') + ' ' + ['18', '30', '00'].join(':')
}
},
dateFormatter(str) {
const d = new Date(str)
const year = d.getFullYear()
const month = (d.getMonth() + 1) < 10 ? '0' + (d.getMonth() + 1) : (d.getMonth() + 1)
const day = d.getDate() < 10 ? '0' + d.getDate() : d.getDate()
return [year, month, day].join('-') + ' ' + ['07', '30', '00'].join(':')
},
dateFormatter1(str) {
const d = new Date(str)
const year = d.getFullYear()
const month = (d.getMonth() + 1) < 10 ? '0' + (d.getMonth() + 1) : (d.getMonth() + 1)
const day = d.getDate() < 10 ? '0' + d.getDate() : d.getDate()
return [year, month, day].join('-') + ' ' + ['18', '30', '00'].join(':')
},
queryClassId() {
const param = {
'class_idStr': this.class_idStr
@@ -532,10 +577,10 @@ export default {
})
},
// 获取子节点数据
loadChildNodes({action, parentNode, callback}) {
loadChildNodes({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({pid: parentNode.id}).then(res => {
parentNode.children = res.content.map(function (obj) {
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
@@ -578,7 +623,7 @@ export default {
},
// 强制完成
forceFinish(data) {
crudProduceshiftorder.forceFinish({row: data}).then(res => {
crudProduceshiftorder.forceFinish({ row: data }).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
@@ -588,8 +633,18 @@ export default {
return parseFloat(row[column.property]).toFixed(2)
},
// 下发按钮禁用条件
is_disabled(len, row) {
if (len === 1 && row.order_status === '00') {
is_disabled(rows) {
var length = rows.length
if (length > 1) {
var flag = false
for (let i = 0; i < rows.length; i++) {
if (rows[i].order_status !== '00') {
flag = true
break
}
}
return flag
} else if (length === 1 && rows[0].order_status === '00') {
return false
} else {
return true
@@ -609,17 +664,23 @@ export default {
})
},
// 下发
submits(row) {
crudProduceshiftorder.submits({produceorder_id: row.produceorder_id}).then(res => {
this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
submits(rows) {
rows.forEach((item) => {
var produceorder_id = item.produceorder_id
crudProduceshiftorder.submits({ produceorder_id: produceorder_id }).then(res => {
})
})
this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
},
add() {
this.addShow = true
},
copyAdd(data) {
this.crud.toCopy(data)
},
[CRUD.HOOK.beforeToAdd]() {
this.initDataPlan()
}
}
}