141d39263f
将getLossList方法改为异步方式，同时获取酸轧/镀锌和分条工序的数据 合并两个工序的数据后再查询钢卷信息，提高数据完整性和准确性 添加updateBy参数区分不同工序的管理员
242 lines
9.8 KiB
Vue
242 lines
9.8 KiB
Vue
<template>
|
||
<div class="app-container" v-loading="loading">
|
||
<el-row>
|
||
<el-form label-width="80px" inline>
|
||
<el-form-item label="开始时间" prop="startTime">
|
||
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime"
|
||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
|
||
</el-form-item>
|
||
<el-form-item label="结束时间" prop="endTime">
|
||
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime"
|
||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
|
||
</el-form-item>
|
||
<el-form-item label="入场钢卷号" prop="endTime">
|
||
<el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
|
||
placeholder="请输入入场钢卷号" clearable @keyup.enter.native="handleQuery" />
|
||
</el-form-item>
|
||
<el-form-item label="当前钢卷号" prop="endTime">
|
||
<el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
||
@keyup.enter.native="handleQuery" />
|
||
</el-form-item>
|
||
<el-form-item label="逻辑库位" prop="endTime">
|
||
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
||
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
||
</el-form-item>
|
||
<el-form-item label="产品名称" prop="endTime">
|
||
<el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
|
||
@keyup.enter.native="handleQuery" />
|
||
</el-form-item>
|
||
<el-form-item label="规格" prop="endTime">
|
||
<memo-input style="width: 200px;" v-model="queryParams.itemSpecification" storageKey="coilSpec"
|
||
placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
|
||
</el-form-item>
|
||
<el-form-item label="材质" prop="endTime">
|
||
<muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
|
||
placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
|
||
</el-form-item>
|
||
<el-form-item label="厂家" prop="endTime">
|
||
<muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
|
||
:options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
|
||
</el-form-item>
|
||
<!-- <el-form-item label="收货计划" prop="planId">
|
||
<el-select style="width: 200px;" v-model="queryParams.planId" placeholder="请输入计划名称搜索收货计划" filterable remote
|
||
:remote-method="remoteMethod">
|
||
<el-option v-for="item in planList" :key="item.planId" :label="item.planName" :value="item.planId" />
|
||
</el-select>
|
||
</el-form-item> -->
|
||
<el-form-item prop="endTime">
|
||
<el-button type="primary" @click="getList">查询</el-button>
|
||
<el-button type="primary" @click="exportData">导出</el-button>
|
||
</el-form-item>
|
||
</el-form>
|
||
</el-row>
|
||
|
||
<el-descriptions title="统计信息" :column="3" border>
|
||
<el-descriptions-item label="总钢卷数量">{{ summary.totalCount }}</el-descriptions-item>
|
||
<el-descriptions-item label="总重">{{ summary.totalWeight }}t</el-descriptions-item>
|
||
<el-descriptions-item label="均重">{{ summary.avgWeight }}t</el-descriptions-item>
|
||
</el-descriptions>
|
||
|
||
<el-descriptions title="明细信息" :column="3" border>
|
||
</el-descriptions>
|
||
<el-table :data="list" border height="calc(100vh - 320px)">
|
||
<el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
|
||
<template slot-scope="scope">
|
||
<coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
|
||
</template>
|
||
</el-table-column>
|
||
<el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
|
||
<template slot-scope="scope">
|
||
<coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
|
||
</template>
|
||
</el-table-column>
|
||
<el-table-column label="创建时间" align="center" prop="createTime" />
|
||
<el-table-column label="逻辑库位" align="center" prop="warehouseName" />
|
||
<!-- <el-table-column label="实际库区" align="center" prop="actualWarehouseName" /> -->
|
||
<el-table-column label="产品类型" align="center" width="250">
|
||
<template slot-scope="scope">
|
||
<ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
|
||
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
|
||
</template>
|
||
</el-table-column>
|
||
<el-table-column label="重量 (吨)" align="center" prop="netWeight" />
|
||
<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="status">
|
||
<template slot-scope="scope">
|
||
{{ scope.row.status === 0 ? '在库' : '已出库' }}
|
||
</template>
|
||
</el-table-column> -->
|
||
<el-table-column label="更新人" align="center" prop="updateByName" />
|
||
<el-table-column label="更新时间" align="center" prop="updateTime" />
|
||
</el-table>
|
||
</div>
|
||
</template>
|
||
|
||
<script>
|
||
import { listCoilWithIds } from "@/api/wms/coil";
|
||
import {
|
||
listPendingAction,
|
||
} from '@/api/wms/pendingAction';
|
||
import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
|
||
import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
|
||
import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
|
||
import MemoInput from "@/components/MemoInput";
|
||
import MutiSelect from "@/components/MutiSelect";
|
||
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
|
||
import { listDeliveryPlan } from '@/api/wms/deliveryPlan'
|
||
|
||
export default {
|
||
components: {
|
||
ProductInfo,
|
||
RawMaterialInfo,
|
||
CoilNo,
|
||
MemoInput,
|
||
MutiSelect,
|
||
WarehouseSelect,
|
||
},
|
||
dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
|
||
data() {
|
||
// 工具函数：个位数补零，保证格式统一（比如 9 → 09，5 → 05）
|
||
const addZero = (num) => num.toString().padStart(2, '0')
|
||
|
||
const now = new Date() // 当前本地北京时间
|
||
// 核心：获取【昨天】的日期对象（自动处理跨月/跨年，无边界问题）
|
||
const yesterday = new Date(now)
|
||
yesterday.setDate(yesterday.getDate() - 1)
|
||
|
||
// 昨天的年、月、日（补零格式化）
|
||
const yesYear = yesterday.getFullYear()
|
||
const yesMonth = addZero(yesterday.getMonth() + 1)
|
||
const yesDay = addZero(yesterday.getDate())
|
||
|
||
// 今天的年、月、日（补零格式化）
|
||
const nowYear = now.getFullYear()
|
||
const nowMonth = addZero(now.getMonth() + 1)
|
||
const nowDay = addZero(now.getDate())
|
||
|
||
// ✅ 目标时间区间：昨天早上6点 至 今天早上6点
|
||
const startTime = `${yesYear}-${yesMonth}-${yesDay} 07:00:00`
|
||
const endTime = `${nowYear}-${nowMonth}-${nowDay} 07:00:00`
|
||
return {
|
||
list: [],
|
||
queryParams: {
|
||
pageNum: 1,
|
||
pageSize: 9999,
|
||
// status: 1,
|
||
byCreateTimeStart: startTime,
|
||
byCreateTimeEnd: endTime,
|
||
selectType: 'raw_material',
|
||
enterCoilNo: '',
|
||
currentCoilNo: '',
|
||
warehouseId: '',
|
||
productName: '',
|
||
itemSpecification: '',
|
||
itemMaterial: '',
|
||
itemManufacturer: '',
|
||
planId: '',
|
||
},
|
||
planList: [],
|
||
loading: false,
|
||
}
|
||
},
|
||
computed: {
|
||
summary() {
|
||
// 总钢卷数量、总重、均重
|
||
const totalCount = this.list.length
|
||
const totalWeight = this.list.reduce((acc, cur) => acc + parseFloat(cur.netWeight), 0)
|
||
const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
|
||
return {
|
||
totalCount,
|
||
totalWeight: totalWeight.toFixed(2),
|
||
avgWeight,
|
||
}
|
||
}
|
||
},
|
||
methods: {
|
||
remoteMethod(query) {
|
||
listDeliveryPlan({ planName: query, pageNum: 1, pageSize: 5, planType: 1 }).then(res => {
|
||
this.planList = res.rows
|
||
})
|
||
},
|
||
async getList() {
|
||
this.loading = true
|
||
const res1 = await listPendingAction({
|
||
// actionStatus: 2,
|
||
warehouseId: this.queryParams.planId,
|
||
// actionType: 401,
|
||
actionType: 11, // 酸轧工序
|
||
pageSize: 999,
|
||
pageNum: 1,
|
||
startTime: this.queryParams.byCreateTimeStart,
|
||
endTime: this.queryParams.byCreateTimeEnd,
|
||
})
|
||
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(',')
|
||
console.log(coilIds)
|
||
if (!coilIds) {
|
||
this.$message({
|
||
message: '暂无数据',
|
||
type: 'warning',
|
||
})
|
||
this.list = []
|
||
this.loading = false
|
||
return
|
||
}
|
||
listCoilWithIds({
|
||
...this.queryParams,
|
||
byCreateTimeStart: undefined,
|
||
byCreateTimeEnd: undefined,
|
||
coilIds: coilIds,
|
||
}).then(res => {
|
||
this.list = res.rows
|
||
this.loading = false
|
||
})
|
||
},
|
||
// 导出
|
||
exportData() {
|
||
this.download('wms/materialCoil/export', {
|
||
coilIds: this.list.map(item => item.coilId).join(',')
|
||
}, `materialCoil_${new Date().getTime()}.xlsx`)
|
||
},
|
||
},
|
||
mounted() {
|
||
this.getList()
|
||
this.remoteMethod('')
|
||
}
|
||
}
|
||
</script>
|
||
|
||
<style scoped></style>
|