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
2023-12-14 18:31:36 +08:00
parent 9f2b73a49f
commit e620dff9b2
14 changed files with 303 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/qd/src/views/wms/product_manage/workorder/adjustIndex.vue
View File

@@ -172,11 +172,11 @@
<template slot-scope="{ row }">
<span
:style="{
color: row.aps_workorder_no === 999 || row.aps_workorder_no == '0' ? '' : 'orange',
fontWeight: row.aps_workorder_no === 999 || row.aps_workorder_no == '0' ? 'normal' : 'bold'
color: row.aps_workorder_no === '999' || row.aps_workorder_no == '0' ? '' : 'orange',
fontWeight: row.aps_workorder_no === '999' || row.aps_workorder_no == '0' ? 'normal' : 'bold'
}"
>
{{ row.aps_workorder_no === 999 || row.aps_workorder_no == '0' ? '未调整' : row.aps_workorder_no }}
{{ row.aps_workorder_no === '999' || row.aps_workorder_no == '0' ? '未调整' : row.aps_workorder_no }}
</span>
</template>
</el-table-column>
@@ -425,7 +425,7 @@ export default {
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT', 'product_area'],
cruds() {
return CRUD({
title: '工单调整', url: 'api/produceWorkorder', idField: 'workorder_id', sort: 'workorder_id,desc',
title: '工单调整', url: 'api/produceWorkorder/queryByAps', idField: 'workorder_id', sort: 'workorder_id,desc',
optShow: {
add: false,
edit: false,

9
mes/qd/src/views/wms/product_manage/workorder/index.vue
View File

@@ -954,7 +954,7 @@ export default {
query: {
order_status: '-1',
product_area: 'A1',
titleSort: 'ShiftOrder.workorder_code desc',
titleSort: 'ShiftOrder.device_code,ShiftOrder.aps_workorder_no',
is_error: '0'
},
crudMethod: { ...crudProduceshiftorder }
@@ -969,7 +969,7 @@ export default {
statisticsSpecOptions: [],
workprocedureListArea: [],
sortTitileList: [{ value: 'ShiftOrder.device_code,ShiftOrder.aps_workorder_no', label: '设备编号' }, {
value: 'ShiftOrder.workorder_code desc',
value: 'ShiftOrder.workorder_status desc,ShiftOrder.workorder_code desc',
label: '工单编号'
}],
zxj: [{ value: 'A1_ZXJ_1', label: '一线1号装箱机' }, { value: 'A1_ZXJ_2', label: '一线2号装箱机' }],
@@ -1068,6 +1068,7 @@ export default {
rows[0].report_qty = this.reportForm.report_qty
crudProduceshiftorder.report(rows[0]).then(res => {
this.crud.notify('报工成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.reportVisible = false
this.crud.toQuery()
})
},
@@ -1315,7 +1316,6 @@ export default {
},
// 新增编辑给form表单物料相关信息赋值
setMaterValue(row) {
debugger
this.form.material_id = row.material_id
this.form.material_code = row.material_code
this.form.material_name = row.material_name
@@ -1327,7 +1327,6 @@ export default {
this.form.material_code = row.material_code
this.form.material_name = row.material_name
this.form.material_spec = row.material_spec
debugger
const params = {
'sale_id': row.sale_id,
'sale_code': row.sale_code + '-' + row.seq_no,
@@ -1339,7 +1338,6 @@ export default {
async queryWorkOrderplanQty(params) {
try {
const res = await crudProduceshiftorder.getWorkOrderplanQty(params)
debugger
if (!isNaN(res) && res > 0) {
this.form.plan_qty = res
}
@@ -1354,7 +1352,6 @@ export default {
})
},
getworkprocedureByarea(area) {
debugger
const params = { product_area: area }
crudWorkProcedure.downSelect(params).then(res => {
this.workprocedureList = res

11
mes/qd/src/views/wms/storage_manage/product/productIvt/productivt.js
View File

@@ -8,6 +8,14 @@ export function add(data) {
})
}
export function queryIvt(params) {
return request({
url: '/api/stIvtStructivtCp',
method: 'get',
params
})
}
export function del(ids) {
return request({
url: '/api/stIvtStructivtCp/delete',
@@ -27,5 +35,6 @@ export function edit(data) {
export default {
add,
edit,
del
del,
queryIvt
}

59
mes/qd/src/views/wms/storage_manage/product/productOut/AddIvt.vue
View File

@@ -87,15 +87,17 @@
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="stor_name" label="仓库名称" />
<el-table-column show-overflow-tooltip min-width="120" prop="stor_name" label="仓库名称" />
<el-table-column show-overflow-tooltip prop="sect_name" label="库区名称" />
<el-table-column show-overflow-tooltip prop="struct_code" label="仓位编码" />
<el-table-column show-overflow-tooltip prop="struct_name" label="仓位名称" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="struct_code" label="仓位编码" min-width="120">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.struct_code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip min-width="120" prop="struct_name" label="仓位名称" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column show-overflow-tooltip prop="sale_code" label="销售单号" />
<el-table-column show-overflow-tooltip min-width="150" prop="sale_code" label="销售单号" />
<el-table-column show-overflow-tooltip min-width="110" prop="seq_no" label="销售单行号" />
<el-table-column show-overflow-tooltip prop="canuse_qty" label="可用数量" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="frozen_qty" label="冻结数量" :formatter="crud.formatNum3" />
@@ -107,11 +109,40 @@
<!--分页组件-->
<pagination />
</div>
<el-dialog
:visible.sync="viewShow"
title="仓位明细"
width="740px"
@close="viewCancel()"
append-to-body
>
<el-table
ref="multipleTable"
:data="mstrow"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip min-width="110" prop="seq_no" label="销售单行号" />
<el-table-column show-overflow-tooltip prop="canuse_qty" label="可用数量" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="frozen_qty" label="冻结数量" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="ivt_qty" label="库存数量" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="warehousing_qty" label="待入数量" :formatter="crud.formatNum3" />
</el-table>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="viewCancel()">关闭</el-button>
</div>
</el-dialog>
<span slot="footer" class="dialog-footer">
<el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
<el-button slot="left" type="primary" @click="submit">保存</el-button>
</span>
</el-dialog>
</template>
<script>
@@ -121,13 +152,15 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import productOut from '@/views/wms/storage_manage/product/productOut/productout'
import ProductIvt from '@/views/wms/storage_manage/product/productIvt/productivt'
export default {
name: 'AddDtl',
components: { rrOperation, pagination, crudOperation },
cruds() {
return CRUD({
title: '用户', url: 'api/stIvtStructivtCp',
title: '用户', url: 'api/stIvtStructivtCp/queryGroup',
optShow: {
add: false,
edit: false,
@@ -158,6 +191,8 @@ export default {
},
data() {
return {
mstrow: [],
viewShow: false,
dialogVisible: false,
opendtlParam: '',
rows: [],
@@ -181,6 +216,16 @@ export default {
[CRUD.HOOK.beforeRefresh]() {
return true
},
toView(row) {
ProductIvt.queryIvt({"struct_code": row.struct_code,"page":0,"size":999}).then(res => {
this.mstrow = res.content
})
this.viewShow = true
},
viewCancel(){
this.mstrow = {}
this.viewShow = false
},
close() {
this.crud.resetQuery(false)
// 清空grid数据