Skip to content

T
TF-MOM-WEB
Commit 4bdde84d authored by “lixuyan”'s avatar “lixuyan”
Browse files
Options

扫码枪录入联调

parent d55b0574
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 108 deletions
applications/dee-mes/src/views/taskExecution/components/ConfirmMaterial/footer.vue
View file @ 4bdde84d
......@@ -70,7 +70,7 @@
<el-table-column :width="80" label="操作" align="center">
<template slot-scope="scope">
<el-button
:disabled="scope.row.extScanCodeRecords[0].status==='未确认'"
:disabled="scope.row.scanCodeRecordsState==='未确认'"
size="mini"
type="danger"
@click="deleteRow(scope.row)"
......@@ -189,20 +189,6 @@ export default {
sortable: true,
minWidth: 120
},
// {
// title: '实发数量',
// show: true,
// key: 'scanCodeRecordVo.amount',
// align: 'center',
// sortable: true
// },
// {
// title: '类型',
// show: true,
// key: 'type',
// align: 'center',
// sortable: true
// },
{
title: '单据编号',
show: true,
......@@ -214,7 +200,7 @@ export default {
{
title: '状态',
show: true,
key: 'extScanCodeRecords[0].status',
key: 'scanCodeRecordsState',
align: 'center',
sortable: true,
minWidth: 100
......@@ -249,65 +235,26 @@ export default {
// 设置数据
this.loading = true
this.tableData = []
const params = {
'searchItems': {
'children': [
{
'items': [
{
'fieldName': 'extSupporting.extProcessPlanId',
'operator': 'EQ',
'value': this.$parent.$parent.$parent.$parent.headerData.aoId
},
{
'fieldName': 'extScanCodeRecords.id',
'operator': 'NOTNULL'
}
],
'operator': 'AND'
}
],
'items': [],
'operator': 'AND'
},
'openProps': [
{
'name': 'extScanCodeRecords'
},
{
'name': 'extMaterial',
'openProps': [
{
'name': 'resType2'
},
{
'name': 'extUnit'
}
]
}
],
'sortItem': [
{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}
],
'toValidateKeys': ''
}
// 发送请求
post(
'/ExtSupportingItem/search',
params
`/ExtSupportingItem/getAllMaterialConfirmationUnder?aoId=${this.$parent.$parent.$parent.$parent.headerData.aoId}`,
{}
)
.then((res) => {
this.tableData = res.items.content.map((p) => {
this.tableData = res.items.map((p) => {
if (!p.extScanCodeRecords) {
p.extScanCodeRecords = []
p.scanCodeRecordsState = '未确认'
} else {
p.scanCodeRecordsState = p.extScanCodeRecords[0].status
}
return {
popoverVisible: false,
uuid: uuidv4(),
...p
}
})
this.tablePagination.total = res.items.totalElements
// this.tablePagination.total = res.items.totalElements
})
.catch((err) => console.error(err))
.finally(() => {
......@@ -315,7 +262,7 @@ export default {
})
},
clickScan(row) {
if (row.extScanCodeRecords[0].status === '已确认') {
if (row.scanCodeRecordsState === '已确认') {
this.$message({
showClose: true,
message: '已确认 不可扫码录入!',
......@@ -324,26 +271,10 @@ export default {
return
}
this.rowId = row.id
// if (['密封剂', '涂料', '胶粘剂'].includes(row.resTypeName)) {
// this.$message({
// showClose: true,
// message: '当前状态-' + row.resTypeName + ' 不可扫码录入!',
// type: 'warning'
// })
// return
// }
$('#' + this.onlyUuid).click()
},
codeScanBar(row) {
// if (['密封剂', '涂料', '胶粘剂'].includes(row.resTypeName)) {
// this.$message({
// showClose: true,
// message: '当前状态-' + row.resTypeName + ' 不可扫码录入!',
// type: 'warning'
// })
// return
// }
if (row.extScanCodeRecords[0].status === '已确认') {
if (row.scanCodeRecordsState === '已确认') {
this.$message({
showClose: true,
message: '已确认 不可扫码录入!',
......@@ -397,7 +328,9 @@ export default {
}
})
.catch((err) => console.log(err))
.finally(() => {})
.finally(() => {
this.init()
})
},
setPage($event, state) {
if (state) {
......
applications/dee-mes/src/views/taskExecution/components/ConfirmMaterial/header.vue
View file @ 4bdde84d
......@@ -135,7 +135,7 @@
show-overflow-tooltip
/>
<el-table-column
prop="extMaterial.resTypeName"
prop="extMaterial.resType2.typeName"
align="center"
label="零件类型"
:width="120"
......@@ -149,13 +149,13 @@
sortable
/>
<el-table-column
prop="unitName"
prop="extMaterial.extUnit.unitName"
align="center"
label="单位"
:width="80"
/>
<el-table-column
prop="extMaterial.modelNo"
prop="jobResponseOutStorageVOS[0].inventory.extMaterial.modelNo"
align="center"
label="型号/件号"
:width="120"
......@@ -163,14 +163,14 @@
show-overflow-tooltip
/>
<el-table-column
prop="arrivedDrawNo"
prop="jobResponseOutStorageVOS[0].inventory.jobResponse.jobOrder.arrivalVer"
align="center"
label="实发版次"
:width="120"
sortable
/>
<el-table-column
prop="extMaterial.testNo"
prop="jobResponseOutStorageVOS[0].inventory.jobResponse.jobOrder.inventoryJobResponses[0].testNo"
align="center"
label="验收单号"
:width="120"
......@@ -178,33 +178,33 @@
show-overflow-tooltip
/>
<el-table-column
prop="checkoutAmount"
prop="jobResponseOutStorageVOS[0].jobOrder.checkoutAmount"
align="center"
label="已接收数量"
:width="130"
sortable
/>
<el-table-column
prop="outsideAmount"
prop="jobResponseOutStorageVOS[0].outsideAmount"
align="center"
label="实发数量"
:width="120"
sortable
/>
<el-table-column
<!-- <el-table-column
prop="type"
align="center"
label="类型"
:width="80"
sortable
/>
<el-table-column
/> -->
<!-- <el-table-column
prop="receiptNo"
align="center"
label="单据编号"
:width="120"
sortable
/>
/> -->
<el-table-column
prop="jobResponseOutStorageVOS[0].actualWeight"
align="center"
......@@ -349,7 +349,11 @@ export default {
this.tableData = res.items.map((p) => {
this.stateList.forEach(element => {
if (element.value === p.reqStatus) {
p.stateName = element.label
if (element.value === 'Not') {
p.stateName = '未出库'
} else {
p.stateName = element.label
}
}
})
return {
......@@ -374,8 +378,8 @@ export default {
return 'scan-code'
}
if (
(column.property === 'actualWeight' && row.actualWeightSelect) ||
(column.property === 'removeWeight' && row.removeWeightSelect)
(column.property === 'jobResponseOutStorageVOS[0].actualWeight' && row.actualWeightSelect) ||
(column.property === 'jobResponseOutStorageVOS[0].removeWeight' && row.removeWeightSelect)
) {
return 'highlight'
}
......@@ -396,20 +400,20 @@ export default {
},
deeTableEdit(row, column, cell, event) {
var that = this
if (row.resTypeName !== '外购成品') return
if (column.property === 'actualWeight') {
if (row.extMaterial.resType2.typeName !== '外购成品' || !row.jobResponseOutStorageVOS) return
if (column.property === 'jobResponseOutStorageVOS[0].actualWeight') {
this.setRowValue = row.actualWeight
row.actualWeightSelect = true
} else if (column.property === 'removeWeight') {
} else if (column.property === 'jobResponseOutStorageVOS[0].removeWeight') {
this.setRowValue = row.removeWeight
row.removeWeightSelect = true
} else {
return
}
this.timer = setTimeout(function() {
if (column.property === 'actualWeight') {
if (column.property === 'jobResponseOutStorageVOS[0].actualWeight') {
row.actualWeightSelect = false
} else if (column.property === 'removeWeight') {
} else if (column.property === 'jobResponseOutStorageVOS[0].removeWeight') {
row.removeWeightSelect = false
}
clearTimeout(this.timer)
......@@ -429,10 +433,9 @@ export default {
var that = this
const param = {
operator: 'MODIFY',
id: row.tjrosId,
id: row.jobResponseOutStorageVOS[0].id,
actualWeight: row.actualWeight,
removeWeight: row.removeWeight,
subTypeName: 'JobResponseOutStorageMatch'
removeWeight: row.removeWeight
}
if (status) {
row.actualWeightSelect = false
......@@ -445,7 +448,7 @@ export default {
if (Number(this.setRowValue) === Number(row.removeWeight)) return
row.removeWeightLoading = true
}
this.HttpRequest('/JobResponseOutStorage/recursion', param, 'post')
post('/JobResponseOutStorage/recursion', param)
.then((res) => {
if (res.message.includes('成功')) {
that.$message({
......@@ -564,6 +567,7 @@ export default {
scanId: null,
count: null
}
this.init()
this.$parent.$parent.$parent.$refs.footer.init()
})
},
......
applications/dee-mes/src/views/taskExecution/index.vue
View file @ 4bdde84d
......@@ -811,7 +811,7 @@ export default {
isQualified: p.joExecuteOpPlan && p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].isQualified,
countOBJReject: p.joExecuteOpPlan && p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].countOBJReject,
countRecord: p.joExecuteOpPlan && p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].countRecord,
countProblem: p.joExecuteOpPlan && p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].countProblem,
countProblem: p.joExecuteOpPlan && p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].spotCount,
countDebugging: p.joExecuteOpPlan && p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].countDebugging,
countQuality: p.joExecuteOpPlan && p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].countQuality,
revoke: p.joExecuteOpPlan && p.joExecuteOpPlan.length && p.joExecuteOpPlan[0].revoke,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment