DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(报表): 优化各工序报表的损耗数据获取逻辑

Browse Source 
将getLossList方法改为异步方式，同时获取酸轧/镀锌和分条工序的数据
合并两个工序的数据后再查询钢卷信息，提高数据完整性和准确性
添加updateBy参数区分不同工序的管理员
This commit is contained in:
砂糖
2026-03-02 10:50:47 +08:00
parent 2aeb19a685
commit 141d39263f
10 changed files with 389 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
klp-ui/src/views/wms/report/zha/day.vue
View File

@@ -65,7 +65,8 @@
<!-- 异常统计 --> <!-- 异常统计 -->
<el-descriptions title="异常统计" :column="4" border> <el-descriptions title="异常统计" :column="4" border>
<el-descriptions-item v-for="item in abSummary" :key="item.label" :label="item.label">{{ item.value }}</el-descriptions-item> <el-descriptions-item v-for="item in abSummary" :key="item.label" :label="item.label">{{ item.value
}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions title="明细信息" :column="3" border> <el-descriptions title="明细信息" :column="3" border>
@@ -312,16 +313,27 @@ export default {
this.loading = false this.loading = false
}) })
}, },
getLossList() { async getLossList() {
this.loading = true this.loading = true
listPendingAction({ const res1 = await listPendingAction({
actionType: 11, // 酸轧工序 actionType: 11, // 酸轧工序
pageSize: 999, pageSize: 999,
pageNum: 1, pageNum: 1,
startTime: this.queryParams.byCreateTimeStart, startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd, endTime: this.queryParams.byCreateTimeEnd,
}).then(res => { })
const actions = res.rows const res2 = await listPendingAction({
// actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 200, // 分条工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
updateBy: 'suanzhakuguan',
})
const actions = res1.rows.concat(res2.rows)
const coilIds = actions.map(item => item.coilId).join(',') const coilIds = actions.map(item => item.coilId).join(',')
console.log(coilIds) console.log(coilIds)
if (!coilIds) { if (!coilIds) {
@@ -342,7 +354,6 @@ export default {
this.lossList = res.rows this.lossList = res.rows
this.loading = false this.loading = false
}) })
})
}, },
// 导出 // 导出
exportData() { exportData() {

20
klp-ui/src/views/wms/report/zha/month.vue
View File

@@ -334,16 +334,27 @@ export default {
this.loading = false this.loading = false
}) })
}, },
getLossList() { async getLossList() {
this.loading = true this.loading = true
listPendingAction({ const res1 = await listPendingAction({
actionType: 11, // 酸轧工序 actionType: 11, // 酸轧工序
pageSize: 999, pageSize: 999,
pageNum: 1, pageNum: 1,
startTime: this.queryParams.byCreateTimeStart, startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd, endTime: this.queryParams.byCreateTimeEnd,
}).then(res => { })
const actions = res.rows const res2 = await listPendingAction({
// actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 200, // 分条工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
updateBy: 'suanzhakuguan',
})
const actions = res1.rows.concat(res2.rows)
const coilIds = actions.map(item => item.coilId).join(',') const coilIds = actions.map(item => item.coilId).join(',')
console.log(coilIds) console.log(coilIds)
if (!coilIds) { if (!coilIds) {
@@ -364,7 +375,6 @@ export default {
this.lossList = res.rows this.lossList = res.rows
this.loading = false this.loading = false
}) })
})
}, },
// 导出 // 导出
exportData() { exportData() {

22
klp-ui/src/views/wms/report/zha/team.vue
View File

@@ -389,16 +389,27 @@ export default {
this.loading = false this.loading = false
}) })
}, },
getLossList() { async getLossList() {
this.loading = true this.loading = true
listPendingAction({ const res1 = await listPendingAction({
actionType: 11, // 酸轧工序 actionType: 11, // 酸轧工序
pageSize: 999, pageSize: 999,
pageNum: 1, pageNum: 1,
startTime: this.queryParams.byCreateTimeStart, startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd, endTime: this.queryParams.byCreateTimeEnd,
}).then(res => { })
const actions = res.rows const res2 = await listPendingAction({
// actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 200, // 分条工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
updateBy: 'suanzhakuguan',
})
const actions = res1.rows.concat(res2.rows)
const coilIds = actions.map(item => item.coilId).join(',') const coilIds = actions.map(item => item.coilId).join(',')
console.log(coilIds) console.log(coilIds)
if (!coilIds) { if (!coilIds) {
@@ -406,7 +417,7 @@ export default {
message: '暂无数据', message: '暂无数据',
type: 'warning', type: 'warning',
}) })
this.list = [] this.lossList = []
this.loading = false this.loading = false
return return
} }
@@ -419,7 +430,6 @@ export default {
this.lossList = res.rows this.lossList = res.rows
this.loading = false this.loading = false
}) })
})
}, },
// 导出 // 导出
exportData() { exportData() {

22
klp-ui/src/views/wms/report/zha/year.vue
View File

@@ -318,16 +318,27 @@ export default {
this.loading = false this.loading = false
}) })
}, },
getLossList() { async getLossList() {
this.loading = true this.loading = true
listPendingAction({ const res1 = await listPendingAction({
actionType: 11, // 酸轧工序 actionType: 11, // 酸轧工序
pageSize: 9999, pageSize: 999,
pageNum: 1, pageNum: 1,
startTime: this.queryParams.byCreateTimeStart, startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd, endTime: this.queryParams.byCreateTimeEnd,
}).then(res => { })
const actions = res.rows const res2 = await listPendingAction({
// actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 200, // 分条工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
updateBy: 'suanzhakuguan',
})
const actions = res1.rows.concat(res2.rows)
const coilIds = actions.map(item => item.coilId).join(',') const coilIds = actions.map(item => item.coilId).join(',')
console.log(coilIds) console.log(coilIds)
if (!coilIds) { if (!coilIds) {
@@ -348,7 +359,6 @@ export default {
this.lossList = res.rows this.lossList = res.rows
this.loading = false this.loading = false
}) })
})
}, },
// 导出 // 导出
exportData() { exportData() {

20
klp-ui/src/views/wms/report/zha_.vue
View File

@@ -179,9 +179,9 @@ export default {
this.planList = res.rows this.planList = res.rows
}) })
}, },
getList() { async getList() {
this.loading = true this.loading = true
listPendingAction({ const res1 = await listPendingAction({
// actionStatus: 2, // actionStatus: 2,
warehouseId: this.queryParams.planId, warehouseId: this.queryParams.planId,
// actionType: 401, // actionType: 401,
@@ -190,8 +190,19 @@ export default {
pageNum: 1, pageNum: 1,
startTime: this.queryParams.byCreateTimeStart, startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd, endTime: this.queryParams.byCreateTimeEnd,
}).then(res => { })
const actions = res.rows const res2 = await listPendingAction({
// actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 200, // 分条工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
updateBy: 'suanzhakuguan',
})
const actions = res1.rows.concat(res2.rows)
const coilIds = actions.map(item => item.coilId).join(',') const coilIds = actions.map(item => item.coilId).join(',')
console.log(coilIds) console.log(coilIds)
if (!coilIds) { if (!coilIds) {
@@ -212,7 +223,6 @@ export default {
this.list = res.rows this.list = res.rows
this.loading = false this.loading = false
}) })
})
}, },
// 导出 // 导出
exportData() { exportData() {

23
klp-ui/src/views/wms/report/zinc/day.vue
View File

@@ -65,7 +65,8 @@
<!-- 异常统计 --> <!-- 异常统计 -->
<el-descriptions title="异常统计" :column="4" border> <el-descriptions title="异常统计" :column="4" border>
<el-descriptions-item v-for="item in abSummary" :key="item.label" :label="item.label">{{ item.value }}</el-descriptions-item> <el-descriptions-item v-for="item in abSummary" :key="item.label" :label="item.label">{{ item.value
}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions title="明细信息" :column="3" border> <el-descriptions title="明细信息" :column="3" border>
@@ -298,16 +299,27 @@ export default {
this.loading = false this.loading = false
}) })
}, },
getLossList() { async getLossList() {
this.loading = true this.loading = true
listPendingAction({ const res1 = await listPendingAction({
actionType: 501, // 镀锌工序 actionType: 501, // 镀锌工序
pageSize: 999, pageSize: 999,
pageNum: 1, pageNum: 1,
startTime: this.queryParams.byCreateTimeStart, startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd, endTime: this.queryParams.byCreateTimeEnd,
}).then(res => { })
const actions = res.rows const res2 = await listPendingAction({
// actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 200, // 分条工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
updateBy: 'duxinkuguan',
})
const actions = res1.rows.concat(res2.rows)
const coilIds = actions.map(item => item.coilId).join(',') const coilIds = actions.map(item => item.coilId).join(',')
console.log(coilIds) console.log(coilIds)
if (!coilIds) { if (!coilIds) {
@@ -328,7 +340,6 @@ export default {
this.lossList = res.rows this.lossList = res.rows
this.loading = false this.loading = false
}) })
})
}, },
// 导出 // 导出
exportData() { exportData() {

22
klp-ui/src/views/wms/report/zinc/month.vue
View File

@@ -320,16 +320,27 @@ export default {
this.loading = false this.loading = false
}) })
}, },
getLossList() { async getLossList() {
this.loading = true this.loading = true
listPendingAction({ const res1 = await listPendingAction({
actionType: 501, // 镀锌工序 actionType: 501, // 镀锌工序
pageSize: 999, pageSize: 999,
pageNum: 1, pageNum: 1,
startTime: this.queryParams.byCreateTimeStart, startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd, endTime: this.queryParams.byCreateTimeEnd,
}).then(res => { })
const actions = res.rows const res2 = await listPendingAction({
// actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 200, // 分条工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
updateBy: 'duxinkuguan',
})
const actions = res1.rows.concat(res2.rows)
const coilIds = actions.map(item => item.coilId).join(',') const coilIds = actions.map(item => item.coilId).join(',')
console.log(coilIds) console.log(coilIds)
if (!coilIds) { if (!coilIds) {
@@ -337,7 +348,7 @@ export default {
message: '暂无数据', message: '暂无数据',
type: 'warning', type: 'warning',
}) })
this.lossList = [] this.list = []
this.loading = false this.loading = false
return return
} }
@@ -350,7 +361,6 @@ export default {
this.lossList = res.rows this.lossList = res.rows
this.loading = false this.loading = false
}) })
})
}, },
// 导出 // 导出
exportData() { exportData() {

48
klp-ui/src/views/wms/report/zinc/team.vue
View File

@@ -94,27 +94,27 @@
<template slot-scope="scope"> <template slot-scope="scope">
<coil-no :coil-no="scope.row.enterCoilNo"></coil-no> <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="当前钢卷号" align="center" prop="currentCoilNo"> <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
<template slot-scope="scope"> <template slot-scope="scope">
<coil-no :coil-no="scope.row.currentCoilNo"></coil-no> <coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="逻辑库位" align="center" prop="warehouseName" /> <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
<el-table-column label="产品类型" align="center" width="250"> <el-table-column label="产品类型" align="center" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" /> <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" /> <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="重量 (吨)" align="center" prop="netWeight" /> <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
<el-table-column label="长度 (米)" align="center" prop="length" /> <el-table-column label="长度 (米)" align="center" prop="length" />
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip /> <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
<el-table-column label="更新人" align="center" prop="updateByName" /> <el-table-column label="更新人" align="center" prop="updateByName" />
<el-table-column label="更新时间" align="center" prop="updateTime" /> <el-table-column label="更新时间" align="center" prop="updateTime" />
</el-table> </el-table>
</el-tab-pane> --> </el-tab-pane> -->
<!-- <el-tab-pane label="产出钢卷" name="output"> --> <!-- <el-tab-pane label="产出钢卷" name="output"> -->
<el-table :data="list" border height="calc(100vh - 320px)"> <el-table :data="list" border height="calc(100vh - 320px)">
<el-table-column label="入场钢卷号" align="center" prop="enterCoilNo"> <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
@@ -376,16 +376,27 @@ export default {
this.loading = false this.loading = false
}) })
}, },
getLossList() { async getLossList() {
this.loading = true this.loading = true
listPendingAction({ const res1 = await listPendingAction({
actionType: 501, // 镀锌工序 actionType: 501, // 镀锌工序
pageSize: 999, pageSize: 999,
pageNum: 1, pageNum: 1,
startTime: this.queryParams.byCreateTimeStart, startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd, endTime: this.queryParams.byCreateTimeEnd,
}).then(res => { })
const actions = res.rows const res2 = await listPendingAction({
// actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 200, // 分条工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
updateBy: 'duxinkuguan',
})
const actions = res1.rows.concat(res2.rows)
const coilIds = actions.map(item => item.coilId).join(',') const coilIds = actions.map(item => item.coilId).join(',')
console.log(coilIds) console.log(coilIds)
if (!coilIds) { if (!coilIds) {
@@ -406,7 +417,6 @@ export default {
this.lossList = res.rows this.lossList = res.rows
this.loading = false this.loading = false
}) })
})
}, },
// 导出 // 导出
exportData() { exportData() {

24
klp-ui/src/views/wms/report/zinc/year.vue
View File

@@ -302,16 +302,27 @@ export default {
this.loading = false this.loading = false
}) })
}, },
getLossList() { async getLossList() {
this.loading = true this.loading = true
listPendingAction({ const res1 = await listPendingAction({
actionType: 501, // 镀锌工序 actionType: 501, // 镀锌工序
pageSize: 9999, pageSize: 999,
pageNum: 1, pageNum: 1,
startTime: this.queryParams.byCreateTimeStart, startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd, endTime: this.queryParams.byCreateTimeEnd,
}).then(res => { })
const actions = res.rows const res2 = await listPendingAction({
// actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 200, // 分条工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
updateBy: 'duxinkuguan',
})
const actions = res1.rows.concat(res2.rows)
const coilIds = actions.map(item => item.coilId).join(',') const coilIds = actions.map(item => item.coilId).join(',')
console.log(coilIds) console.log(coilIds)
if (!coilIds) { if (!coilIds) {
@@ -319,7 +330,7 @@ export default {
message: '暂无数据', message: '暂无数据',
type: 'warning', type: 'warning',
}) })
this.lossList = [] this.list = []
this.loading = false this.loading = false
return return
} }
@@ -332,7 +343,6 @@ export default {
this.lossList = res.rows this.lossList = res.rows
this.loading = false this.loading = false
}) })
})
}, },
// 导出 // 导出
exportData() { exportData() {

20
klp-ui/src/views/wms/report/zinc_.vue
View File

@@ -179,9 +179,9 @@ export default {
this.planList = res.rows this.planList = res.rows
}) })
}, },
getList() { async getList() {
this.loading = true this.loading = true
listPendingAction({ const res1 = await listPendingAction({
// actionStatus: 2, // actionStatus: 2,
warehouseId: this.queryParams.planId, warehouseId: this.queryParams.planId,
// actionType: 401, // actionType: 401,
@@ -190,8 +190,19 @@ export default {
pageNum: 1, pageNum: 1,
startTime: this.queryParams.byCreateTimeStart, startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd, endTime: this.queryParams.byCreateTimeEnd,
}).then(res => { })
const actions = res.rows const res2 = await listPendingAction({
// actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
actionType: 200, // 分条工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
updateBy: 'duxinkuguan',
})
const actions = res1.rows.concat(res2.rows)
const coilIds = actions.map(item => item.coilId).join(',') const coilIds = actions.map(item => item.coilId).join(',')
console.log(coilIds) console.log(coilIds)
if (!coilIds) { if (!coilIds) {
@@ -212,7 +223,6 @@ export default {
this.list = res.rows this.list = res.rows
this.loading = false this.loading = false
}) })
})
}, },
// 导出 // 导出
exportData() { exportData() {