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

add:修改老车间工单打印

Browse Source
This commit is contained in:
zhangzq
2024-11-05 19:17:38 +08:00
parent d604552b9a
commit 5d09730b64
7 changed files with 146 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
mes/qd/src/views/wms/old_manage/old_package/index.vue
View File

@@ -85,22 +85,22 @@
</el-select>
</el-form-item>
</el-col>
<rrOperation/>
<rrOperation />
</el-row>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
size="mini"
icon="el-icon-check"
@click="save"
>
保存
</el-button>
<!-- <el-button-->
<!-- slot="right"-->
<!-- class="filter-item"-->
<!-- type="success"-->
<!-- size="mini"-->
<!-- icon="el-icon-check"-->
<!-- @click="save"-->
<!-- >-->
<!-- 保存-->
<!-- </el-button>-->
<el-button
slot="right"
class="filter-item"
@@ -137,19 +137,19 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="仓位编码" prop="struct_code">
<el-input v-model="form.struct_code" style="width: 200px;"/>
<el-input v-model="form.struct_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="仓位名称" prop="struct_name">
<el-input v-model="form.struct_name" style="width: 200px;"/>
<el-input v-model="form.struct_name" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="仓位简称">
<el-input v-model="form.simple_name" style="width: 200px;"/>
<el-input v-model="form.simple_name" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -167,7 +167,7 @@
<el-col :span="12">
<el-form-item label="载具号">
<label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
<el-input v-model="form.storagevehicle_code" style="width: 200px;"/>
<el-input v-model="form.storagevehicle_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -193,12 +193,12 @@
<el-col :span="12">
<el-form-item label="容量" prop="capacity">
<label slot="label">容&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量:</label>
<el-input v-model="form.capacity" style="width: 200px;"/>
<el-input v-model="form.capacity" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="承受重量" prop="weight">
<el-input v-model="form.weight" style="width: 200px;"/>
<el-input v-model="form.weight" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
@@ -206,13 +206,13 @@
<el-col :span="12">
<el-form-item label="宽度" prop="width">
<label slot="label">宽&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label>
<el-input v-model="form.width" style="width: 200px;"/>
<el-input v-model="form.width" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="深度" prop="zdepth">
<label slot="label">深&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label>
<el-input v-model="form.zdepth" style="width: 200px;"/>
<el-input v-model="form.zdepth" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
@@ -220,7 +220,7 @@
<el-col :span="12">
<el-form-item label="高度" prop="height">
<label slot="label">高&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label>
<el-input v-model="form.height" style="width: 200px;"/>
<el-input v-model="form.height" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -252,7 +252,7 @@
<el-col :span="12">
<el-form-item label="备注">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" style="width: 550px;" rows="2" type="textarea"/>
<el-input v-model="form.remark" style="width: 550px;" rows="2" type="textarea" />
</el-form-item>
</el-col>
</el-row>
@@ -273,30 +273,30 @@
@open="printFormm()"
@close="close()"
>
<el-card class="box-card" shadow="never">
<el-form ref="form" :inline="true" :model="form" size="mini" label-width="160px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
<el-form-item label="订单号" prop="pwd">
<el-input v-model="printForm.sale_code" disabled type="text" style="width: 200px" />
</el-form-item>
<el-form-item label="物料编号" prop="pwd">
<el-input v-model="printForm.material_code" disabled type="text" style="width: 200px" />
</el-form-item>
<el-form-item label="当前箱标签" prop="pwd">
<el-input v-model="printForm.bar_code" disabled type="text" style="width: 200px" />
</el-form-item>
<el-form-item label="当前打印箱号" prop="pwd">
<el-input v-model="printForm.print_no" type="text" style="width: 100px" />
<el-button type="primary" @click="resetno">重置箱号</el-button>
</el-form-item>
<el-form-item label="打印标签数量" prop="pwd">
<el-input-number v-model="printForm.print_number" type="text" style="width: 100px" />
</el-form-item>
</el-form>
</el-card>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submit">打 印</el-button>
</span>
<el-card class="box-card" shadow="never">
<el-form ref="form" :inline="true" :model="form" size="mini" label-width="160px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
<el-form-item label="订单号" prop="pwd">
<el-input v-model="printForm.sale_id" disabled type="text" style="width: 200px" />
</el-form-item>
<el-form-item label="物料编号" prop="pwd">
<el-input v-model="printForm.material_code" disabled type="text" style="width: 200px" />
</el-form-item>
<el-form-item label="当前箱标签" prop="pwd">
<el-input v-model="printForm.bar_code" disabled type="text" style="width: 200px" />
</el-form-item>
<el-form-item label="当前打印箱号" prop="pwd">
<el-input v-model="printForm.print_no" type="text" style="width: 100px" />
<el-button type="primary" @click="resetno">重置箱号</el-button>
</el-form-item>
<el-form-item label="打印标签数量" prop="pwd">
<el-input-number v-model="printForm.print_num" type="text" style="width: 100px" />
</el-form-item>
</el-form>
</el-card>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submit">打 印</el-button>
</span>
</el-dialog>
<!--表格渲染-->
<el-table
@@ -310,29 +310,29 @@
@select="handleSelectionChange"
@select-all="onSelectAll"
>
<el-table-column type="selection" width="55"/>
<el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识"/>
<el-table-column prop="workorder_code" label="工单编号" width="140px"/>
<el-table-column type="selection" width="55" />
<el-table-column prop="workorder_code" label="工单编号" width="140px" />
<el-table-column prop="sale_id" label="订单号" width="140px" />
<el-table-column prop="shift_type_scode" label="班次类型">
<template slot-scope="scope">
{{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
</template>
</el-table-column>
<!-- <el-table-column prop="workprocedure_code" label="工序编码" />-->
<el-table-column prop="product_area" label="生产车间"/>
<el-table-column prop="plan_qty" label="计划数量"/>
<el-table-column prop="real_qty" label="实际数量"/>
<el-table-column prop="person_name" label="生产人员"/>
<el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip/>
<el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip/>
<el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip/>
<el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip/>
<el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4"/>
<el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip/>
<el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip/>
<el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip/>
<el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip/>
<el-table-column prop="device_code" label="当前设备编码" width="100" show-overflow-tooltip/>
<el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="plan_qty" label="计划数量" />
<el-table-column prop="real_qty" label="实际数量" />
<el-table-column prop="person_name" label="生产人员" />
<el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip />
<el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip />
<el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip />
<el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4" />
<el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip />
<el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip />
<el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip />
<el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip />
<el-table-column prop="device_code" label="当前设备编码" width="100" show-overflow-tooltip />
<el-table-column prop="is_canupdate_update" label="操作工是否允许修改报工数量" width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.IS_OR_NOT[scope.row.is_canupdate_update] }}
@@ -358,29 +358,29 @@
{{ dict.label.IS_OR_NOT[scope.row.is_error] }}
</template>
</el-table-column>
<el-table-column prop="error_info" label="异常信息" show-overflow-tooltip/>
<el-table-column prop="remark" label="备注"/>
<el-table-column prop="create_name" label="创建人" show-overflow-tooltip/>
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip/>
<el-table-column prop="update_name" label="修改人" show-overflow-tooltip/>
<el-table-column prop="update_time" label="修改时间" show-overflow-tooltip/>
<el-table-column prop="error_info" label="异常信息" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip />
<el-table-column prop="update_name" label="修改人" show-overflow-tooltip />
<el-table-column prop="update_time" label="修改时间" show-overflow-tooltip />
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>
<script>
import crudStructattr from '@/api/wms/basedata/st/structattr'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import CRUD, { crud, form, header, presenter } 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 crudSectattr from '@/api/wms/basedata/st/sectattr'
import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder'
import {getLodop} from '@/assets/js/lodop/LodopFuncs'
import { getLodop } from '@/assets/js/lodop/LodopFuncs'
import orderExt from '@/views/wms/old_manage/old_package/orderExt'
const defaultForm = {
@@ -431,7 +431,7 @@ const defaultForm = {
export default {
name: 'Structattr',
dicts: ['ST_HEIGHT_TYPE', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'IS_OR_NOT', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'PDM_BI_SHIFTTYPE'],
components: {pagination, crudOperation, rrOperation, udOperation},
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -447,7 +447,7 @@ export default {
},
url: 'api/produceWorkorder',
idField: 'struct_id',
crudMethod: {...crudStructattr}
crudMethod: { ...crudStructattr }
})
},
data() {
@@ -493,8 +493,16 @@ export default {
val[1] = form.sect_id
form.cascader = val
},
submit() {},
resetno() {},
submit() {
this.printNumber()
},
resetno() {
const param = { 'sale_id': this.currentRow.sale_id, 'material_code': this.currentRow.material_code }
orderExt.reset(param).then(res => {
this.crud.notify('重置成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.dialogVisible = false
})
},
handleSelectionChange(val, row) {
if (val.length > 1) {
this.$refs.table.clearSelection()
@@ -536,17 +544,6 @@ export default {
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
},
startWork() {
if (!this.crud.query.one_box_package_qty || !this.crud.query.one_package_qty || !this.crud.query.box_type ||
!this.crud.query.target_roadway || !this.crud.query.is_flip ||
!this.crud.query.tray_full_num) {
this.crud.notify('缺少开工必要参数，保证输入框内不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.currentRow.extra_map = this.crud.query
this.currentRow.extra_map.package_qty = Math.ceil(this.currentRow.plan_qty / this.currentRow.extra_map.one_package_qty)
this.currentRow.extra_map.box_num = Math.ceil(this.currentRow.extra_map.package_qty / this.currentRow.extra_map.one_box_package_qty)
orderExt.add(this.currentRow).then(res => {
})
crudProduceshiftorder.openStart(this.currentRow).then(res => {
})
this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
@@ -584,20 +581,29 @@ export default {
this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
printFormm(){
const param ={"sale_id":this.currentRow.sale_id,"material_code":this.currentRow.material_code}
printFormm() {
const parse = JSON.parse(this.currentRow.package_ext)
const flip = parse.is_flip
const target_roadway = parse.target_roadway
const workorderCode = this.currentRow.workorder_code
const param = { 'workorder_code': workorderCode, 'is_flip': flip, 'target_roadway': target_roadway, 'sale_id': this.currentRow.sale_id, 'material_code': this.currentRow.material_code }
orderExt.getQuery(param).then(res => {
this.printForm = res
})
},
close(){
this.printForm = {},
this.dialogVisible =false
close() {
this.printForm = {},
this.dialogVisible = false
},
print(){
this.dialogVisible =true
print() {
this.dialogVisible = true
},
printNumber(){
printNumber() {
const parse = JSON.parse(this.currentRow.package_ext)
this.currentRow.print_num = this.printForm.print_num
this.currentRow.is_flip = parse.is_flip
this.currentRow.target_roadway = parse.target_roadway
orderExt.getExtList(this.currentRow).then(res => {
if (res.length == 0 || !res) {
this.crud.notify('该工单需要打印的箱数为0', CRUD.NOTIFICATION_TYPE.INFO)

8
mes/qd/src/views/wms/old_manage/old_package/orderExt.js
View File

@@ -22,6 +22,12 @@ export function getQuery(data) {
method: 'post',
data
})
} export function reset(data) {
return request({
url: 'api/mpsSaleOrderIcExt/reset',
method: 'post',
data
})
}
export default { add, getExtList, getQuery }
export default { add, getExtList, getQuery, reset }