{{ l.lineName }}
-
-
-
-
搜索
重置
From 94840b2153074e0a3e22fda7c09ff6e1ba72a152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Mon, 1 Jun 2026 12:58:35 +0800
Subject: [PATCH 08/29] =?UTF-8?q?feat(mes/roll/grind):=20=E5=AE=9E?=
=?UTF-8?q?=E7=8E=B0=E8=BD=A7=E8=BE=8A=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
1. 新增轧辊列表头部新增按钮和轧辊明细面板的修改、删除按钮
2. 增加轧辊新增/编辑弹窗，包含完整的轧辊信息表单和校验
3. 对接轧辊CRUD后端接口，实现新增、修改、删除逻辑
4. 调整左侧轧辊面板宽度适配新增内容
---
.../com/klp/mes/roll/domain/MesRollInfo.java | 3 +
klp-ui/src/views/mes/roll/grind/index.vue | 196 +++++++++++++++++-
2 files changed, 195 insertions(+), 4 deletions(-)
diff --git a/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollInfo.java b/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollInfo.java
index fdae7bfa..fb9a6345 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollInfo.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollInfo.java
@@ -71,6 +71,9 @@ public class MesRollInfo extends BaseEntity {
/** 厂家 */
private String manufacturer;
+ /** 备注 */
+ private String remark;
+
@TableLogic
private Integer delFlag;
}
diff --git a/klp-ui/src/views/mes/roll/grind/index.vue b/klp-ui/src/views/mes/roll/grind/index.vue
index 3e66b1db..4bc0a821 100644
--- a/klp-ui/src/views/mes/roll/grind/index.vue
+++ b/klp-ui/src/views/mes/roll/grind/index.vue
@@ -49,6 +49,7 @@
+
+
+
+
+
+
+
+
+
@@ -343,12 +374,13 @@ import CoilSelector from "@/components/CoilSelector";
import { listMaterialCoil } from "@/api/wms/coil";
const PHYS_TEMPLATE_HEADERS = [
- '当前钢卷号', '屈服强度(MPa)', '抗拉强度(MPa)', '伸长率(%)', '规定塑性延伸强度(MPa)', '硬度(HRB)',
+ '当前钢卷号', '厂家卷号', '屈服强度(MPa)', '抗拉强度(MPa)', '伸长率(%)', '规定塑性延伸强度(MPa)', '硬度(HRB)',
'镀层重量(g/m²)', '弯曲试验', '表面质量', '表面结构', '镀层表面结构', '边缘状态'
];
const PHYS_HEADER_MAP = {
'当前钢卷号': 'coilNo',
+ '厂家卷号': 'supplierCoilNo',
'屈服强度(MPa)': 'yieldStrength',
'抗拉强度(MPa)': 'tensileStrength',
'伸长率(%)': 'elongation',
@@ -429,6 +461,10 @@ export default {
importLoading: false,
coilNoOptions: [],
coilNoLoading: false,
+ tempSupplierCoilNo: '',
+ supplierCoilNoLoading: false,
+ ambiguousVisible: false,
+ ambiguousRows: [],
};
},
created() {
@@ -520,6 +556,34 @@ export default {
this.coilNoLoading = false;
});
},
+ querySupplierCoilNo(queryString, cb) {
+ if (!queryString || queryString.length < 2) {
+ cb([]);
+ return;
+ }
+ this.supplierCoilNoLoading = true;
+ listMaterialCoil({
+ supplierCoilNo: queryString,
+ pageNum: 1,
+ pageSize: 20
+ }).then(response => {
+ const options = (response.rows || []).map(item => ({
+ value: item.supplierCoilNo,
+ label: item.supplierCoilNo,
+ enterCoilNo: item.enterCoilNo
+ }));
+ cb(options);
+ }).finally(() => {
+ this.supplierCoilNoLoading = false;
+ });
+ },
+ handleSelectSupplierCoilNo(item) {
+ if (item.enterCoilNo) {
+ this.form.coilNo = item.enterCoilNo;
+ this.$refs["form"].validateField('coilNo');
+ }
+ this.tempSupplierCoilNo = '';
+ },
handleBatchAdd(rows) {
this.loading = true;
this.buttonLoading = true;
@@ -589,12 +653,89 @@ export default {
if (!this.importFile || !this.importRawData.length) { this.$message.warning('暂无数据可校验'); return; }
this.importValidateLoading = true;
this.importErrorList = [];
- for (let i = 0; i < this.importRawData.length; i++) {
+ this.ambiguousRows = [];
+ const dataRows = this.importRawData;
+ for (let i = 0; i < dataRows.length; i++) {
const rowNum = i + 2;
- let coilNo = '';
- PHYS_TEMPLATE_HEADERS.forEach((h, j) => { if (PHYS_HEADER_MAP[h] === 'coilNo') coilNo = this.importRawData[i][j]; });
- if (!coilNo || !String(coilNo).trim()) this.importErrorList.push({ rowNum, errorMsg: '当前钢卷号不能为空' });
+ let coilNo = '', supplierCoilNo = '';
+ PHYS_TEMPLATE_HEADERS.forEach((h, j) => {
+ if (PHYS_HEADER_MAP[h] === 'coilNo') coilNo = dataRows[i][j];
+ if (PHYS_HEADER_MAP[h] === 'supplierCoilNo') supplierCoilNo = dataRows[i][j];
+ });
+ coilNo = String(coilNo || '').trim();
+ supplierCoilNo = String(supplierCoilNo || '').trim();
+ if (!coilNo && !supplierCoilNo) {
+ this.importErrorList.push({ rowNum, errorMsg: '当前钢卷号和厂家卷号不能同时为空' });
+ }
}
+ // 处理仅填写厂家卷号的行
+ if (this.importErrorList.length === 0) {
+ this.importTableData.forEach((row, idx) => {
+ const cn = (row.coilNo || '').trim();
+ const sn = (row.supplierCoilNo || '').trim();
+ row._sno = sn;
+ row._idx = idx;
+ row._fillCoilNo = cn;
+ if (sn && !cn) row._needMatch = true;
+ });
+ const needMatchRows = this.importTableData.filter(r => r._needMatch);
+ if (needMatchRows.length > 0) {
+ const uniqueSnos = [...new Set(needMatchRows.map(r => r._sno))];
+ const multiMap = {};
+ try {
+ const results = await Promise.all(
+ uniqueSnos.map(sno => listMaterialCoil({ supplierCoilNo: sno, pageNum: 1, pageSize: 50 }))
+ );
+ uniqueSnos.forEach((sno, idx) => {
+ const rows = (results[idx] && results[idx].rows) || [];
+ const enterNos = [...new Set(rows.map(r => r.enterCoilNo).filter(Boolean))];
+ multiMap[sno] = enterNos;
+ });
+ } catch (err) {
+ this.importValidateLoading = false;
+ this.importHandleError('厂家卷号匹配失败：' + err.message);
+ return;
+ }
+ const ambiguousList = [];
+ needMatchRows.forEach(row => {
+ const candidates = multiMap[row._sno] || [];
+ if (candidates.length === 0) {
+ this.importErrorList.push({ rowNum: (row.rowNum || (row._idx + 2)), errorMsg: `厂家卷号"${row._sno}"未匹配到入场卷号` });
+ } else if (candidates.length === 1) {
+ row.coilNo = candidates[0];
+ } else {
+ ambiguousList.push({
+ _idx: row._idx,
+ supplierCoilNo: row._sno,
+ options: candidates,
+ selected: null
+ });
+ }
+ });
+ if (ambiguousList.length > 0) {
+ this.ambiguousRows = ambiguousList;
+ this.importValidateLoading = false;
+ this.ambiguousVisible = true;
+ return;
+ }
+ }
+ }
+ this.finishValidation();
+ },
+ confirmAmbiguous() {
+ const unselected = this.ambiguousRows.filter(r => !r.selected);
+ if (unselected.length > 0) {
+ this.$message.warning('请为所有行选择入场卷号');
+ return;
+ }
+ this.ambiguousRows.forEach(item => {
+ this.importTableData[item._idx].coilNo = item.selected;
+ });
+ this.ambiguousVisible = false;
+ this.importValidateLoading = true;
+ this.finishValidation();
+ },
+ finishValidation() {
if (this.importErrorList.length > 0) {
this.$message.error(`数据校验失败，共发现${this.importErrorList.length}条错误`);
} else {
@@ -647,10 +788,10 @@ export default {
this.$refs.importUpload?.clearFiles();
},
importDownloadTemplate() {
- const data = [PHYS_TEMPLATE_HEADERS, ['示例卷号', '300', '420', '35', '260', '85', '275', '合格', '良好', '光面', '无锌花', '良好']];
+ const data = [PHYS_TEMPLATE_HEADERS, ['示例卷号', '示例厂家卷号', '300', '420', '35', '260', '85', '275', '合格', '良好', '光面', '无锌花', '良好']];
const wb = XLSX.utils.book_new();
const ws = XLSX.utils.aoa_to_sheet(data);
- ws['!cols'] = [{ wch: 16 }, { wch: 16 }, { wch: 16 }, { wch: 10 }, { wch: 20 }, { wch: 10 }, { wch: 16 }, { wch: 10 }, { wch: 10 }, { wch: 10 }, { wch: 12 }, { wch: 10 }];
+ ws['!cols'] = [{ wch: 16 }, { wch: 16 }, { wch: 16 }, { wch: 16 }, { wch: 10 }, { wch: 20 }, { wch: 10 }, { wch: 16 }, { wch: 10 }, { wch: 10 }, { wch: 10 }, { wch: 12 }, { wch: 10 }];
XLSX.utils.book_append_sheet(wb, ws, '导入模板');
XLSX.writeFile(wb, '物理性能导入模板.xlsx');
},
diff --git a/klp-ui/src/views/mes/qc/inspection/task.vue b/klp-ui/src/views/mes/qc/inspection/task.vue
index b2c67be5..4c15fa84 100644
--- a/klp-ui/src/views/mes/qc/inspection/task.vue
+++ b/klp-ui/src/views/mes/qc/inspection/task.vue
@@ -75,6 +75,7 @@
@@ -258,27 +259,57 @@
-
-
-
- 轧辊列表
+
+
@@ -251,14 +344,13 @@ import rollLineMixin from '../rollLineMixin'
export default {
name: 'GrindRoom',
mixins: [rollLineMixin],
+ dicts: ['mes_roll_operator'],
data() {
return {
- // 产线列表
productionLines: [],
filterLineId: null,
- lineTabOrder: [], // 本地记录的点击顺序（最近点过的在前）
+ lineTabOrder: [],
- // 左侧辊列表
rollLoading: false,
allRolls: [],
filteredRolls: [],
@@ -266,32 +358,25 @@ export default {
filterType: '',
filterManufacturer: '',
- // 右侧选中辊
selectedRollId: null,
selectedRoll: null,
- // 磨削记录
grindLoading: false,
grindList: [],
- // 月度汇总
currentYear: new Date().getFullYear(),
monthlyList: [],
- // 行内编辑：editRow 不为 null 时表示当前正在编辑/新增的行数据
- // __isNew: true → 新增行；存在 grindId → 修改行
editRow: null,
grindSaving: false
}
},
computed: {
- // 当前登录用户名（RuoYi Plus 的 store 路径）
currentUserName() {
return this.$store.state.user.name || this.$store.getters.name || ''
},
- // 产线 tab 按本地点击顺序排序
sortedProductionLines() {
const order = this.lineTabOrder
return [...this.productionLines].sort((a, b) => {
@@ -304,11 +389,15 @@ export default {
})
},
- // 有效当前辊径：优先取 currentDia，无则取最新磨削记录的磨后径
+ manufacturerOptions() {
+ const set = new Set()
+ this.allRolls.forEach(r => {
+ if (r.manufacturer) set.add(r.manufacturer)
+ })
+ return [...set].sort()
+ },
+
effectiveCurrentDia() {
- // if (this.selectedRoll && this.selectedRoll.currentDia != null) {
- // return parseFloat(this.selectedRoll.currentDia)
- // }
if (this.grindList.length > 0) {
const latest = [...this.grindList].sort((a, b) => {
const ta = a.grindTime ? new Date(a.grindTime).getTime() : 0
@@ -316,13 +405,10 @@ export default {
return tb - ta
})[0]
if (latest && latest.diaAfter != null) return parseFloat(latest.diaAfter)
- } else {
- return null
}
return null
},
- // 表格数据：新增时在顶部插入一个编辑行占位
tableData() {
if (this.editRow && this.editRow.__isNew) {
return [this.editRow, ...this.grindList]
@@ -331,20 +417,17 @@ export default {
}
},
- created() {},
-
methods: {
onLineResolved() {
this.filterLineId = this.lineId
const uid = this.$store.state.user?.userId || 0
- try { this.lineTabOrder = JSON.parse(localStorage.getItem(`grind_line_order_${uid}`) || '[]') } catch {}
+ try { this.lineTabOrder = JSON.parse(localStorage.getItem(`grind_line_order_${uid}`) || '[]') } catch { /* ignore */ }
listProductionLine({ pageNum: 1, pageSize: 100 }).then(res => {
this.productionLines = res.rows || []
})
this.loadRolls()
},
- // ── 轧辊列表 ──────────────────────────────────────
loadRolls() {
this.rollLoading = true
listRollInfo({ pageNum: 1, pageSize: 500, lineId: this.filterLineId }).then(res => {
@@ -368,9 +451,9 @@ export default {
},
filterRolls() {
this.filteredRolls = this.allRolls.filter(r => {
- const matchNo = !this.filterNo || r.rollNo.includes(this.filterNo)
+ const matchNo = !this.filterNo || r.rollNo.includes(this.filterNo)
const matchType = !this.filterType || r.rollType === this.filterType
- const matchMfr = !this.filterManufacturer || (r.manufacturer || '').toLowerCase().includes(this.filterManufacturer.toLowerCase())
+ const matchMfr = !this.filterManufacturer || r.manufacturer === this.filterManufacturer
return matchNo && matchType && matchMfr
})
},
@@ -385,7 +468,6 @@ export default {
this.loadGrindList(r.rollId)
},
- // ── 磨削记录 ──────────────────────────────────────
loadGrindList(rollId) {
this.grindLoading = true
listRollGrind(rollId).then(res => {
@@ -408,7 +490,6 @@ export default {
this.loadMonthlyStats()
},
- // ── 行内编辑 ──────────────────────────────────────
isEditing(row) {
if (!this.editRow) return false
if (row.__isNew && this.editRow.__isNew) return true
@@ -421,20 +502,20 @@ export default {
startAdd() {
const now = new Date()
const pad = n => String(n).padStart(2, '0')
- const grindTime = `${now.getFullYear()}-${pad(now.getMonth()+1)}-${pad(now.getDate())} ` +
+ const grindTime = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ` +
`${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`
this.editRow = {
- __isNew: true,
- rollId: this.selectedRollId,
+ __isNew: true,
+ rollId: this.selectedRollId,
grindTime,
- team: undefined,
- diaBefore: this.effectiveCurrentDia != null ? this.effectiveCurrentDia : undefined,
- diaAfter: undefined,
- rollShape: '平',
+ team: undefined,
+ diaBefore: this.effectiveCurrentDia != null ? this.effectiveCurrentDia : undefined,
+ diaAfter: undefined,
+ rollShape: '平',
flawResult: '合格',
- hardness: undefined,
- operator: this.currentUserName,
- remark: undefined
+ hardness: undefined,
+ operator: this.currentUserName,
+ remark: undefined
}
},
startEdit(row) {
@@ -448,10 +529,7 @@ export default {
const r = this.editRow
if (!r.grindTime) { this.$modal.msgWarning('请填写磨削时间'); return }
if (r.diaBefore == null) { this.$modal.msgWarning('请填写磨前直径'); return }
- if (r.diaAfter == null) { this.$modal.msgWarning('请填写磨后直径'); return }
-
- // 自动带入操作人
- r.operator = this.currentUserName
+ if (r.diaAfter == null) { this.$modal.msgWarning('请填写磨后直径'); return }
this.grindSaving = true
const isNew = !!r.__isNew
@@ -480,7 +558,6 @@ export default {
})
},
- // ── 计算磨削量 ──────────────────────────────────────
grindAmountOf(row) {
const b = parseFloat(row.diaBefore)
const a = parseFloat(row.diaAfter)
@@ -488,7 +565,6 @@ export default {
return '—'
},
- // 辅助
statusLabel(s) {
return { Online: '在线', Standby: '备用', Offline: '离线', Scrapped: '报废' }[s] || s
}
@@ -500,7 +576,7 @@ export default {
.grind-page { background: #f4f5f7; height: 100%; }
.grind-layout { display: flex; gap: 12px; height: 100%; }
-/* 产线 Tab 列 */
+/* ── 左侧产线 Tab ── */
.line-tabs {
width: 64px;
flex-shrink: 0;
@@ -530,31 +606,87 @@ export default {
font-weight: 600;
}
-/* 轧辊列表 */
-.grind-left { width: 220px; flex-shrink: 0; }
-.grind-right { flex: 1; min-width: 0; }
+/* ── 右侧主体 ── */
+.grind-main {
+ flex: 1;
+ min-width: 0;
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+}
-.grind-card { border: 1px solid #dcdee0; border-radius: 4px; }
-.h-full { height: calc(100vh - 120px); display: flex; flex-direction: column; }
+/* 顶部检索栏 */
+.search-bar {
+ display: flex;
+ align-items: center;
+ gap: 20px;
+ padding: 10px 14px;
+ background: #fff;
+ border: 1px solid #dcdee0;
+ border-radius: 4px;
+ flex-shrink: 0;
+}
+
+/* 下方内容区：左右分栏 */
+.content-area {
+ flex: 1;
+ min-height: 0;
+ display: flex;
+ gap: 10px;
+}
+
+/* 左侧轧辊列表面板 */
+.roll-list-panel {
+ width: 220px;
+ flex-shrink: 0;
+ height: calc(100vh - 140px);
+ overflow-y: auto;
+}
+
+/* 右侧明细面板 */
+.detail-panel {
+ flex: 1;
+ min-width: 0;
+ overflow-y: auto;
+}
+
+/* 明细卡片 */
+.detail-card {
+ border: 1px solid #dcdee0;
+ border-radius: 4px;
+}
+.detail-card ::v-deep .el-card__body {
+ overflow: auto;
+}
+
+/* 通用卡片 */
+.panel-card {
+ border: 1px solid #dcdee0;
+ border-radius: 4px;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+}
+.panel-card ::v-deep .el-card__body {
+ flex: 1;
+ min-height: 0;
+ overflow-y: auto;
+}
.card-header { display: flex; align-items: center; gap: 8px; }
.card-title { font-size: 13px; font-weight: 600; color: #3d4b5c; }
+.card-count { font-size: 11px; color: #9aa0a6; background: #f0f2f5; padding: 1px 8px; border-radius: 10px; margin-left: auto; }
-/* 辊列表 */
-.roll-filter { padding: 0 0 4px; }
-::v-deep .el-card .el-card__body {
- overflow-y: scroll;
- overflow-x: hidden;
-}
-.roll-list { overflow-y: auto; flex: 1; min-height: 0; padding: 0; }
+/* 轧辊列表 */
+.roll-list { padding: 0; }
.roll-item { padding: 8px 12px; cursor: pointer; border-bottom: 1px solid #f0f2f5; }
.roll-item:hover { background: #f5f7fa; }
.roll-item--active { background: #e8f4ff !important; border-left: 3px solid #409eff; }
-.ri-no { font-family: 'Consolas', monospace; font-size: 13px; font-weight: 600; color: #1f2329; }
-.ri-meta { display: flex; align-items: center; gap: 6px; margin-top: 3px; }
-.ri-dia { font-size: 11px; color: #9aa0a6; }
+.ri-no { font-family: 'Consolas', monospace; font-size: 13px; font-weight: 600; color: #1f2329; }
+.ri-meta { display: flex; align-items: center; gap: 6px; margin-top: 3px; }
+.ri-dia { font-size: 11px; color: #9aa0a6; }
.ri-manufacturer { font-size: 10px; color: #909399; margin-top: 2px; }
-.ri-line { font-size: 10px; color: #b0b3bb; margin-top: 2px; }
+.ri-line { font-size: 10px; color: #b0b3bb; margin-top: 2px; }
.ri-status { font-size: 11px; }
.roll-empty { text-align: center; color: #c0c4cc; padding: 20px 0; font-size: 12px; }
@@ -582,17 +714,18 @@ export default {
/* 行内编辑 */
.computed-val { color: #409eff; font-weight: 600; font-size: 13px; }
-.auto-operator { color: #0a7c42; font-size: 12px; }
.remark-text { font-size: 12px; color: #5f6368; }
-/* 去掉 number input 的默认上下箭头，保持表格整洁 */
.el-table :deep(input[type=number]::-webkit-inner-spin-button),
.el-table :deep(input[type=number]::-webkit-outer-spin-button) { -webkit-appearance: none; }
.el-table :deep(input[type=number]) { -moz-appearance: textfield; }
-
diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue
index 862c3b84..669b1932 100644
--- a/klp-ui/src/views/wms/delivery/waybill/index.vue
+++ b/klp-ui/src/views/wms/delivery/waybill/index.vue
@@ -56,11 +56,6 @@
-
+
+
+
+
+
+
+
+
+
-
-
+ 轧辊列表
+ {{ filteredRolls.length }}
+
+
+
+
+
+ {{ r.rollNo }}
+
+ {{ r.manufacturer }}
+ {{ r.lineName }}
+ 暂无数据
+
-
- 全部
- WR
- BR
- CR
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.team || '—' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ grindAmountOf(editRow) }}
+
+ {{ row.grindAmount }}
+
+
+
+
+
+
+
+ {{ row.rollShape || '—' }}
+
+
+
+
+
+
+
+
+ {{ row.flawResult || '—' }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.operator || '' }}
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
-
- 请从左侧选择一个轧辊
+
+
+
+
+
+ 轧辊明细
+
+
+
+ 轧辊编号{{ selectedRoll.rollNo }}
+ 辊型{{ { WR: '工作辊', BR: '支撑辊', CR: '中间辊' }[selectedRoll.rollType] || '—' }}
+ 材质{{ selectedRoll.material || '—' }}
+ 初始辊径{{ selectedRoll.initialDia != null ? selectedRoll.initialDia + ' mm' : '—' }}
+ 当前辊径{{ effectiveCurrentDia != null ? effectiveCurrentDia + ' mm' : '—' }}
+ 最小辊径{{ selectedRoll.minDia != null ? selectedRoll.minDia + ' mm' : '—' }}
+ 磨削次数{{ tableData.length ? tableData.length + ' 次' : '0 次' }}
+ 粗糙度{{ selectedRoll.roughness != null ? selectedRoll.roughness + ' μm' : '—' }}
+ 凸度{{ selectedRoll.crown != null ? selectedRoll.crown + ' mm' : '—' }}
+ 状态
+ {{ statusLabel(selectedRoll.status) }}
+
+ 制造日期{{ selectedRoll.manufactureDate || '—' }}
+ 备注{{ selectedRoll.remark || '—' }}
+
+ 磨削台账
+ 新增磨削记录
+
+
+
+
+
+
+
+ {{ currentYear }} 年月度汇总
+
+
+
+
-
-
-
-
- {{ r.rollNo }}
-
- {{ r.manufacturer }}
- {{ r.lineName }}
- 暂无数据
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ grindAmountOf(editRow) }}
-
- {{ row.grindAmount }}
-
-
-
-
-
-
-
-
- {{ row.rollShape || '—' }}
-
-
-
-
-
-
-
-
-
- {{ row.flawResult || '—' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存
- 取消
-
-
- 修改
- 删除
-
-
-
-
-
-
-
-
+
请从左侧选择一个轧辊
-
-
-
-
-
-
- 轧辊编号{{ selectedRoll.rollNo }}
- 辊型{{ selectedRoll.rollType === 'WR' ? '工作辊' : '支撑辊' }}
- 材质{{ selectedRoll.material || '—' }}
- 初始辊径{{ selectedRoll.initialDia != null ? selectedRoll.initialDia + ' mm' : '—' }}
- 当前辊径{{ effectiveCurrentDia != null ? effectiveCurrentDia + ' mm' : '—' }}
- 最小辊径{{ selectedRoll.minDia != null ? selectedRoll.minDia + ' mm' : '—' }}
- 磨削次数{{ tableData.length ? tableData.length + ' 次' : '0 次' }}
- 粗糙度{{ selectedRoll.roughness != null ? selectedRoll.roughness + ' μm' : '—' }}
- 凸度{{ selectedRoll.crown != null ? selectedRoll.crown + ' mm' : '—' }}
- 状态
- {{ statusLabel(selectedRoll.status) }}
-
- 制造日期{{ selectedRoll.manufactureDate || '—' }}
- 备注{{ selectedRoll.remark || '—' }}
-
- 磨削台账
- 新增磨削记录
-
-
-
-
-
-
-
- {{ currentYear }} 年月度汇总
-
-
-
-
轧辊列表
{{ filteredRolls.length }}
+ 新增轧辊
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1237,4 +1373,4 @@ export default {
.plan-sheet-section {
margin-top: 16px;
}
-
\ No newline at end of file
+
diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue
index 862e4e12..a65086c0 100644
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -60,14 +60,20 @@
+
+
+
+ 请从左侧选择一个轧辊
@@ -82,6 +83,8 @@
轧辊明细
+ 修改
+ 删除
轧辊编号{{ selectedRoll.rollNo }}
@@ -332,11 +335,108 @@
-
-
+
-
-
+
- {{ '更新信息' }}
-
+
+ 更新后的净重和实测厚度均不能超过源卷的对应值
+
+
@@ -530,6 +536,10 @@ export default {
isDrAction() {
return this.actionType === 504 || this.actionType === 524
},
+ /** 镀锌/酸轧产线免验净重和厚度范围 */
+ isExemptFromValidation() {
+ return [11, 120, 200, 201, 520, 202, 501, 521].includes(Number(this.actionType))
+ },
// 动态显示标签
getItemLabel() {
if (this.updateForm.materialType === '成品') {
@@ -814,6 +824,22 @@ export default {
}
}
+ // 校验净重和实测厚度不超过源卷（镀锌/酸轧除外）
+ if (!this.isExemptFromValidation) {
+ const parentNetWeight = parseFloat(this.currentInfo.netWeight) || 0
+ const parentThickness = parseFloat(this.currentInfo.actualThickness) || 0
+ const updateNetWeight = parseFloat(this.updateForm.netWeight) || 0
+ const updateThickness = parseFloat(this.updateForm.actualThickness) || 0
+ if (updateNetWeight > 0 && parentNetWeight > 0 && updateNetWeight > parentNetWeight) {
+ this.$message.error(`更新后净重(${updateNetWeight}T)不能超过源卷净重(${parentNetWeight}T)`)
+ return false
+ }
+ if (updateThickness > 0 && parentThickness > 0 && updateThickness > parentThickness) {
+ this.$message.error(`更新后实测厚度(${updateThickness}mm)不能超过源卷实测厚度(${parentThickness}mm)`)
+ return false
+ }
+ }
+
const loadingInstance = this.$loading({
lock: true,
text: '正在更新钢卷信息，请稍后...',
From 7e6bc1e8b46469f589423277cf25ad9cd826cf66 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 1 Jun 2026 14:38:56 +0800
Subject: [PATCH 12/29] =?UTF-8?q?fix(attendance):=20=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E8=80=83=E5=8B=A4=E7=8A=B6=E6=80=81=E8=AF=86=E5=88=AB=E9=80=BB?=
=?UTF-8?q?=E8=BE=91=E5=B9=B6=E8=A1=A5=E5=85=85=E6=BC=8F=E6=89=93=E5=8D=A1?=
=?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
1. 在考勤状态筛选、汇总卡片和图例中将“迟到/早退”标签更新为“迟到/早退/缺卡”，以包含漏打卡情况
2. 后端服务中，在考勤状态常量列表新增“missed_start”、“missed_end”、“missed”三种漏打卡状态
3. 重构上下班打卡时间判断逻辑：当打卡时间晚于理论上班时间或早于理论下班时间超过30分钟时，标记为漏打卡（上班漏打卡或下班漏打卡）
4. 调整状态覆盖逻辑：上班漏打卡或下班漏打卡状态会覆盖原有的迟到/早退状态；若上下班均漏打卡则标记为全天漏打卡（missed）
5. 更新考勤记录处理：当标记为漏打卡时，对应的首次或末次打卡时间字段设为null
6. 优化旷工判定逻辑：单独处理上午段（P1）或下午段（P2）漏打卡的情况，分别标记为半天旷工（absent_half）
7. 前端新增漏打卡状态对应的日历样式（状态色块为#e6a23c）和状态描述文本（“上班漏打卡”、“下班漏打卡”）
---
.../wms/hrm/attendance/attendanceCheck.vue | 16 ++-
.../impl/WmsAttendanceCheckServiceImpl.java | 110 +++++++++++-------
2 files changed, 82 insertions(+), 44 deletions(-)
diff --git a/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue b/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
index 4bb16ad9..1716ea73 100644
--- a/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
+++ b/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
@@ -171,7 +171,7 @@
@@ -396,7 +396,7 @@
{{ currentPersonData.employeeName }}
{{ personSummary.normal }}天
- {{ personSummary.abnormal }}天
+ {{ personSummary.abnormal }}天
{{ personSummary.absentHalf }}天
{{ personSummary.absentFull }}天
{{ personSummary.noRecord }}天
@@ -456,7 +456,7 @@
+
- 暂存内容
- 保存更新
+
+
+
+
+ {{ '更新信息' }}
+
-
+ 暂存内容
+ 保存更新
+
正常
- 迟到/早退
+ 迟到/早退/缺卡
半天旷工
全天旷工
无记录
@@ -957,6 +957,8 @@ export default {
case 'absent_half': return 'status-absent-half'
case 'absent_full': return 'status-absent-full'
case 'abnormal': return 'status-abnormal'
+ case 'missed_start': return 'status-missed'
+ case 'missed_end': return 'status-missed'
default: return 'status-default'
}
},
@@ -972,8 +974,10 @@ export default {
case 'early_two': return '早退II'
case 'absent_half': return '半天旷工'
case 'absent_full': return '全天旷工'
- case 'abnormal': return '迟到/早退'
+ case 'abnormal': return '迟到/早退/缺卡'
case 'missed': return '未打卡'
+ case 'missed_start': return '上班漏打卡'
+ case 'missed_end': return '下班漏打卡'
default: return '无'
}
},
@@ -1325,6 +1329,10 @@ export default {
background-color: #c0c4cc;
}
+.status-missed {
+ background-color: #e6a23c;
+}
+
.shift-name {
font-size: 12px;
color: #606266;
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java
index dfd4f3df..501dc961 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java
@@ -49,7 +49,9 @@ import java.util.stream.Collectors;
public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService {
private static final List STATUS_SEVERITY = java.util.Arrays.asList("normal", "late_warn", "early_warn",
- "late_one", "early_one", "late_two", "early_two", "absent_half");
+ "late_one", "early_one", "late_two", "early_two", "absent_half", "missed_start", "missed_end", "missed");
+
+ private static final long LATE_EARLY_MAX_SECONDS = 30 * 60L;
private static final int BATCH_SIZE = 500;
@@ -530,6 +532,7 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService
private void checkPeriod(WmsAttendanceCheck check, WmsAttendanceRule rule, int period,
List periodRecords, Date expectedStart, Date expectedEnd) {
+ // 旷工：0条打卡记录
if (periodRecords.isEmpty()) {
if (period == 1) {
check.setP1Status("missed");
@@ -550,53 +553,72 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService
int earlyMinutes = 0;
BigDecimal deduct = BigDecimal.ZERO;
String status = "normal";
+ boolean startMissed = false;
+ boolean endMissed = false;
- if (expStart != null && firstCheck.isAfter(expStart)) {
- lateMinutes = (int) Duration.between(expStart, firstCheck).toMinutes();
- if (lateMinutes > rule.getAbsentHalfDay()) {
- status = "absent_half";
- } else if (lateMinutes > rule.getLateOne()) {
- status = "late_two";
- deduct = deduct.add(rule.getDeductTwo());
- } else if (lateMinutes > rule.getLateWarn()) {
- status = "late_one";
- deduct = deduct.add(rule.getDeductOne());
- } else {
- status = "late_warn";
+ // 上班检测：晚于理论上班时间30分钟以上 → 漏打卡
+ if (expStart != null) {
+ long lateSecs = Duration.between(expStart, firstCheck).getSeconds();
+ if (lateSecs > LATE_EARLY_MAX_SECONDS) {
+ startMissed = true;
+ } else if (lateSecs > 0) {
+ lateMinutes = (int) (lateSecs / 60);
+ if (lateMinutes > rule.getAbsentHalfDay()) {
+ status = "absent_half";
+ } else if (lateMinutes > rule.getLateOne()) {
+ status = "late_two";
+ deduct = deduct.add(rule.getDeductTwo());
+ } else if (lateMinutes > rule.getLateWarn()) {
+ status = "late_one";
+ deduct = deduct.add(rule.getDeductOne());
+ } else {
+ status = "late_warn";
+ }
}
}
+ // 下班检测：早于理论下班时间30分钟以上 → 漏打卡
if (expEnd != null && lastCheck.isBefore(expEnd)) {
- int min = (int) Duration.between(lastCheck, expEnd).toMinutes();
- if (min > rule.getAbsentHalfDay()) {
- status = maxSeverity(status, "absent_half");
- earlyMinutes = min;
- } else if (min > rule.getLateOne()) {
- status = maxSeverity(status, "early_two");
- deduct = deduct.add(rule.getDeductTwo());
- earlyMinutes = min;
- } else if (min > rule.getLateWarn()) {
- status = maxSeverity(status, "early_one");
- deduct = deduct.add(rule.getDeductOne());
- earlyMinutes = min;
- } else {
- if ("normal".equals(status)) {
- status = "early_warn";
+ long earlySecs = Duration.between(lastCheck, expEnd).getSeconds();
+ if (earlySecs > LATE_EARLY_MAX_SECONDS) {
+ endMissed = true;
+ } else if (earlySecs > 0) {
+ earlyMinutes = (int) (earlySecs / 60);
+ if (earlyMinutes > rule.getAbsentHalfDay()) {
+ status = maxSeverity(status, "absent_half");
+ } else if (earlyMinutes > rule.getLateOne()) {
+ status = maxSeverity(status, "early_two");
+ deduct = deduct.add(rule.getDeductTwo());
+ } else if (earlyMinutes > rule.getLateWarn()) {
+ status = maxSeverity(status, "early_one");
+ deduct = deduct.add(rule.getDeductOne());
+ } else {
+ if ("normal".equals(status)) {
+ status = "early_warn";
+ }
}
- earlyMinutes = min;
}
}
+ // 上班漏打卡或下班漏打卡会覆盖原有状态
+ if (startMissed && endMissed) {
+ status = "missed";
+ } else if (startMissed) {
+ status = maxSeverity(status, "missed_start");
+ } else if (endMissed) {
+ status = maxSeverity(status, "missed_end");
+ }
+
if (period == 1) {
- check.setP1FirstCheck(firstRec.getChecktime());
- check.setP1LastCheck(lastRec.getChecktime());
+ check.setP1FirstCheck(startMissed ? null : firstRec.getChecktime());
+ check.setP1LastCheck(endMissed ? null : lastRec.getChecktime());
check.setP1LateMinutes(lateMinutes);
check.setP1EarlyMinutes(earlyMinutes);
check.setP1Status(status);
check.setP1Deduct(deduct);
} else {
- check.setP2FirstCheck(firstRec.getChecktime());
- check.setP2LastCheck(lastRec.getChecktime());
+ check.setP2FirstCheck(startMissed ? null : firstRec.getChecktime());
+ check.setP2LastCheck(endMissed ? null : lastRec.getChecktime());
check.setP2LateMinutes(lateMinutes);
check.setP2EarlyMinutes(earlyMinutes);
check.setP2Status(status);
@@ -622,19 +644,27 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService
if ("absent_half".equals(check.getP1Status()) || "absent_half".equals(check.getP2Status())) {
hasAbsentHalf = true;
}
- if ("missed".equals(check.getP1Status())) {
- if (check.getP2StartTime() != null) {
- if ("missed".equals(check.getP2Status())) {
- check.setAbsentType("full_day");
- check.setOverallStatus("absent_full");
- return;
- }
+
+ boolean p1Missed = "missed".equals(check.getP1Status());
+ boolean p2Missed = check.getP2Status() != null && "missed".equals(check.getP2Status());
+ boolean hasP2 = check.getP2StartTime() != null;
+
+ if (p1Missed) {
+ if (hasP2 && !p2Missed) {
+ check.setAbsentType("half_day");
+ check.setOverallStatus("absent_half");
+ return;
} else {
check.setAbsentType("full_day");
check.setOverallStatus("absent_full");
return;
}
}
+ if (p2Missed) {
+ check.setAbsentType("half_day");
+ check.setOverallStatus("absent_half");
+ return;
+ }
if (check.getP1StartTime() == null && check.getP2StartTime() == null) {
check.setAbsentType("full_day");
check.setOverallStatus("absent_full");
From 8b1d7ed2803ba9a074bef2817b0a4e2c9651636e Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 1 Jun 2026 15:14:34 +0800
Subject: [PATCH 13/29] =?UTF-8?q?feat(wms/report):=20=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E5=87=BA=E5=88=97=E9=A1=BA?=
=?UTF-8?q?=E5=BA=8F=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E5=AF=BC?=
=?UTF-8?q?=E5=87=BA=E5=BC=B9=E7=AA=97=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
1. 在ExcelUtil工具类中新增exportExcelOrdered方法，支持按指定顺序的列动态生成表头和数据行进行导出
2. 重构接收报表页面的自定义导出弹窗：将布局拆分为左侧可选列面板和右侧导出顺序面板，支持拖拽排序
3. 新增后端/exportCustomOrdered接口，接收有序字段列表并调用新的导出方法
4. 优化弹窗样式：调整宽度、间距、滚动区域，新增顺序序号和移除按钮
5. 移除原有的/exportCustom接口，统一使用新的有序导出逻辑
---
.../com/klp/common/utils/poi/ExcelUtil.java | 68 ++++++
klp-ui/src/views/wms/report/receive.vue | 211 +++++++++++++++---
.../controller/WmsMaterialCoilController.java | 51 +++--
3 files changed, 277 insertions(+), 53 deletions(-)
diff --git a/klp-common/src/main/java/com/klp/common/utils/poi/ExcelUtil.java b/klp-common/src/main/java/com/klp/common/utils/poi/ExcelUtil.java
index 773abe33..b23d37a5 100644
--- a/klp-common/src/main/java/com/klp/common/utils/poi/ExcelUtil.java
+++ b/klp-common/src/main/java/com/klp/common/utils/poi/ExcelUtil.java
@@ -26,10 +26,15 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
/**
* Excel相关处理
@@ -353,4 +358,67 @@ public class ExcelUtil {
return IdUtil.fastSimpleUUID() + "_" + filename + ".xlsx";
}
+ /**
+ * 导出excel（按指定顺序的列导出，使用动态表头）
+ *
+ * @param list 导出数据集合
+ * @param sheetName 工作表的名称
+ * @param orderedFields 按导出顺序排列的Java字段名列表
+ * @param fieldLabelMap Java字段名 -> Excel列头中文名 映射
+ * @param response 响应体
+ */
+ public static void exportExcelOrdered(List list, String sheetName,
+ List orderedFields,
+ Map fieldLabelMap,
+ HttpServletResponse response) {
+ if (orderedFields == null || orderedFields.isEmpty()) {
+ throw new IllegalArgumentException("导出列不能为空");
+ }
+ // 构建动态表头
+ List> heads = orderedFields.stream()
+ .map(f -> Collections.singletonList(fieldLabelMap.getOrDefault(f, f)))
+ .collect(Collectors.toList());
+
+ // 构建数据行
+ List> data = new ArrayList<>(list.size());
+ if (!list.isEmpty()) {
+ Map fieldCache = new HashMap<>();
+ Class clazz = list.get(0).getClass();
+ for (T vo : list) {
+ List
+ 厂家卷号匹配到多条入场卷号，请为每行选择对应记录
+
+
-
- {{ coilNo }}
-
+
+
@@ -488,6 +519,9 @@ export default {
enterCoilNoLoading: false,
selectedEnterCoilNos: [],
tempEnterCoilNo: '',
+ selectedSupplierCoilNos: [],
+ tempSupplierCoilNo: '',
+ supplierCoilNoLoading: false,
attachmentOpen: false,
attachmentTitle: '',
attachmentLoading: false,
@@ -558,6 +592,8 @@ export default {
this.resetTaskForm();
this.selectedEnterCoilNos = [];
this.tempEnterCoilNo = '';
+ this.selectedSupplierCoilNos = [];
+ this.tempSupplierCoilNo = '';
this.taskOpen = true;
this.taskTitle = "添加检验任务";
},
@@ -581,6 +617,13 @@ export default {
this.selectedEnterCoilNos = [];
}
this.tempEnterCoilNo = '';
+ // 初始化已选择的厂家卷号
+ if (response.data.supplierCoilNos) {
+ this.selectedSupplierCoilNos = response.data.supplierCoilNos.split(',').filter(item => item.trim());
+ } else {
+ this.selectedSupplierCoilNos = [];
+ }
+ this.tempSupplierCoilNo = '';
this.taskLoading = false;
this.taskOpen = true;
this.taskTitle = "修改检验任务";
@@ -636,7 +679,7 @@ export default {
handleQuickCreate() {
this.schemeVisible = true;
},
- handleSchemeConfirm({ template, taskCode, taskType, belongCompany, coilIds, enterCoilNos }) {
+ handleSchemeConfirm({ template, taskCode, taskType, belongCompany, coilIds, enterCoilNos, supplierCoilNos }) {
this.taskLoading = true;
addInspectionTaskWithItems({
taskCode: taskCode,
@@ -645,7 +688,8 @@ export default {
belongCompany: belongCompany,
taskType: taskType,
coilIds: coilIds || undefined,
- enterCoilNos: enterCoilNos || undefined
+ enterCoilNos: enterCoilNos || undefined,
+ supplierCoilNos: supplierCoilNos || undefined
}).then(() => {
this.$modal.msgSuccess("快捷创建成功");
this.getTaskList();
@@ -757,6 +801,43 @@ export default {
this.selectedEnterCoilNos.splice(index, 1);
this.taskForm.enterCoilNos = this.selectedEnterCoilNos.join(',');
},
+ querySupplierCoilNo(queryString, cb) {
+ if (!queryString || queryString.length < 2) {
+ cb([]);
+ return;
+ }
+ this.supplierCoilNoLoading = true;
+ listMaterialCoil({
+ supplierCoilNo: queryString,
+ pageNum: 1,
+ pageSize: 20
+ }).then(response => {
+ const options = (response.rows || []).map(item => ({
+ value: item.supplierCoilNo,
+ label: item.supplierCoilNo,
+ enterCoilNo: item.enterCoilNo
+ })).filter(opt => !this.selectedSupplierCoilNos.includes(opt.value));
+ cb(options);
+ }).finally(() => {
+ this.supplierCoilNoLoading = false;
+ });
+ },
+ handleSelectSupplierCoilNo(item) {
+ if (!this.selectedSupplierCoilNos.includes(item.value)) {
+ this.selectedSupplierCoilNos.push(item.value);
+ }
+ this.taskForm.supplierCoilNos = this.selectedSupplierCoilNos.join(',');
+ if (item.enterCoilNo && !this.selectedEnterCoilNos.includes(item.enterCoilNo)) {
+ this.selectedEnterCoilNos.push(item.enterCoilNo);
+ this.taskForm.enterCoilNos = this.selectedEnterCoilNos.join(',');
+ this.$refs["taskForm"].validateField('enterCoilNos');
+ }
+ this.tempSupplierCoilNo = '';
+ },
+ removeSupplierCoilNo(index) {
+ this.selectedSupplierCoilNos.splice(index, 1);
+ this.taskForm.supplierCoilNos = this.selectedSupplierCoilNos.join(',');
+ },
cancelTask() {
this.taskOpen = false;
this.resetTaskForm();
@@ -787,6 +868,8 @@ export default {
this.taskCoilList = [];
this.selectedEnterCoilNos = [];
this.tempEnterCoilNo = '';
+ this.selectedSupplierCoilNos = [];
+ this.tempSupplierCoilNo = '';
this.resetForm("taskForm");
},
From b134539e539688e5d4199cb73cd339972719fac3 Mon Sep 17 00:00:00 2001
From: wangyu <823267011@qq.com>
Date: Mon, 1 Jun 2026 17:11:36 +0800
Subject: [PATCH 18/29] =?UTF-8?q?=E6=8F=90=E4=BA=A43d=E9=92=A2=E5=8D=B7?=
=?UTF-8?q?=E5=88=9D=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
klp-ui/package.json | 1 +
.../wms/warehouse/components/Warehouse3D.vue | 647 ++++++++++++++++++
klp-ui/src/views/wms/warehouse/overview.vue | 55 +-
3 files changed, 691 insertions(+), 12 deletions(-)
create mode 100644 klp-ui/src/views/wms/warehouse/components/Warehouse3D.vue
diff --git a/klp-ui/package.json b/klp-ui/package.json
index 2a2d5e7b..1aaa8d73 100644
--- a/klp-ui/package.json
+++ b/klp-ui/package.json
@@ -73,6 +73,7 @@
"quill": "1.3.7",
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
+ "three": "^0.160.1",
"vditor": "^3.11.1",
"video.js": "^8.23.3",
"vue": "2.6.12",
diff --git a/klp-ui/src/views/wms/warehouse/components/Warehouse3D.vue b/klp-ui/src/views/wms/warehouse/components/Warehouse3D.vue
new file mode 100644
index 00000000..5b2a7680
--- /dev/null
+++ b/klp-ui/src/views/wms/warehouse/components/Warehouse3D.vue
@@ -0,0 +1,647 @@
+
+
-
+
+
+
-
+
+ 可输入入场卷号或厂家卷号，两者互通匹配
+
+
+
+ {{ coilNo }}
+
+
+
+
+ {{ coilNo }}
+
+
+
+
+
+
+
+
+
diff --git a/klp-ui/src/views/wms/warehouse/overview.vue b/klp-ui/src/views/wms/warehouse/overview.vue
index 17dd2e9c..eeae019b 100644
--- a/klp-ui/src/views/wms/warehouse/overview.vue
+++ b/klp-ui/src/views/wms/warehouse/overview.vue
@@ -10,18 +10,23 @@
+
+ 钢卷库 3D 可视化
+ 地面存放 · 最大叠放 2 层 · 无货架 + FPS: {{ fps }} +
+
+
+
+
+
+ 等轴
+ 俯视
+ 正视
+ 侧视
+
+
+ 左键旋转 · 滚轮缩放 · 右键平移 · 点击钢卷查看 · [R] 复位 · [Esc] 关闭
+
+
+
+ 钢卷 {{ detail && detail.id }}
+库位{{ detail && detail.posKey }} 第{{ detail && detail.layer }}层
+ 钢卷号{{ detail && detail.id }}
+ 钢种{{ detail && detail.grade }}
+ 宽度×外径{{ detail && (detail.width + ' × Ø' + detail.od) }}
+ 重量(t){{ detail && detail.weight }}
+ 扫码状态{{ detail && scanText(detail.scan) }}
+
+
+ 库区统计
+
+
+
+
+
+
+
+
+
+
+ 总库位
{{ stats.total }}
已占用
{{ stats.used }}
空闲位
{{ stats.free }}
占用率
{{ stats.pct }}
钢卷总数
{{ stats.coils }}
双层叠放
{{ stats.doubled }}
钢卷明细
+
+
+
+
+ | 库位 | 钢卷号 | 规格 | 状态 |
|---|---|---|---|
| {{ c.posKey }} L{{ c.layer }} | +{{ c.id }} | +{{ c.width }}×Ø{{ c.od }} | +{{ scanShort(c.scan) }} | +
-
-
-
+
+
+
+
+
@@ -66,12 +71,13 @@
From 29328d70e9d454d5c5f18c57ca48d14a980395b1 Mon Sep 17 00:00:00 2001
From: wangyu <823267011@qq.com>
Date: Tue, 2 Jun 2026 10:08:47 +0800
Subject: [PATCH 24/29] =?UTF-8?q?=E6=8F=90=E4=BA=A43d=E9=92=A2=E5=8D=B7?=
=?UTF-8?q?=EF=BC=8C=E8=BF=BD=E6=BA=AF=E5=92=8C=E6=84=8F=E5=BA=93=E5=86=85?=
=?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wms/warehouse/components/Warehouse3D.vue | 288 ++++++++++++++----
klp-ui/src/views/wms/warehouse/overview.vue | 2 +-
2 files changed, 228 insertions(+), 62 deletions(-)
diff --git a/klp-ui/src/views/wms/warehouse/components/Warehouse3D.vue b/klp-ui/src/views/wms/warehouse/components/Warehouse3D.vue
index 1c1107d3..79b46aa6 100644
--- a/klp-ui/src/views/wms/warehouse/components/Warehouse3D.vue
+++ b/klp-ui/src/views/wms/warehouse/components/Warehouse3D.vue
@@ -28,15 +28,48 @@
Z 轴 · 排 (R)
+
@@ -55,15 +88,15 @@
-
+
+
钢卷 {{ detail && detail.id }}
-库位{{ detail && detail.posKey }} · 第 {{ detail && detail.layer }} 层
- 钢卷号{{ detail && detail.id }}
- 钢种{{ detail && detail.grade }}
- 宽度×外径{{ detail && (detail.width + ' × Ø' + detail.od) }}
- 重量(t){{ detail && detail.weight }}
- 扫码状态{{ detail && scanText(detail.scan) }}
+ 钢卷 {{ detail && detail.coilNo }}
+库位{{ detail && (detail.warehouseName || detail.posKey) }} · 第 {{ detail && detail.layer }} 层
+ 钢卷号{{ detail && detail.coilNo }}
+ 入库钢卷号{{ detail && (detail.enterCoilNo || '-') }}
+ 材质{{ detail && detail.material }}
+ 规格{{ detail && detail.specification }}
+ 毛重(kg){{ detail && fmtNum(detail.grossWeight) }}
+ 净重(kg){{ detail && fmtNum(detail.netWeight) }}
+ 质量状态{{ detail && detail.qualityStatus }}
+
+ 移库信息
+ | 时间 | 库位 | 操作 | 出入库 |
|---|---|---|---|
| {{ m.time }} | +{{ m.warehouse }} | +{{ m.operationType }} | +{{ m.inOutType }} | +
暂无移库记录
+
+ 生产追溯
+
+
+
+
+
+ {{ step.action }}
+ {{ step.time }}
+
+ 操作员：{{ step.operation }}
+
+
+ {{ c.currentCoilNo }}
+
+
+ 暂无追溯数据
钢卷明细
| 库位 | 钢卷号 | 规格 | 状态 | |||
|---|---|---|---|---|---|---|
| 库位 | 钢卷号 | 规格 | 重量 | |||
| {{ c.posKey }} L{{ c.layer }} | -{{ c.id }} | -{{ c.width }}×Ø{{ c.od }} | -{{ scanShort(c.scan) }} | +{{ c.coilNo }} | +{{ c.specification }} | +{{ fmtNum(c.grossWeight) }} |
+
+
+
+
+
+
diff --git a/klp-ui/src/views/mes/qc/certificate/components/templates/GalvanizingTemplate.vue b/klp-ui/src/views/mes/qc/certificate/components/templates/GalvanizingTemplate.vue
new file mode 100644
index 00000000..84ca61b8
--- /dev/null
+++ b/klp-ui/src/views/mes/qc/certificate/components/templates/GalvanizingTemplate.vue
@@ -0,0 +1,360 @@
+
+
+
+
+
+ 
+
+
+ 科伦普
+ KE LUN PU
+
+
+ 冷硬产品质量证明书
+ COLD HARD PRODUCT QUALITY CERTIFICATE
+
+
+ 嘉祥科伦普重工有限公司
+ 山东省济宁市嘉祥县化工园区
+
+
+
+
+
+
+
+
+
+
+
+ | 执行标准(SPECIFICATION): | +{{ certificate.standard || '/' }} | +证明书号(CERTIFICATE NO.): | +{{ certificate.certificateNo || '' }} | +
| 收货单位(CONSIGNEE): | +{{ certificate.consignee || '-' }} | +合同号(CONTRACT NO.): | +{{ certificate.contractNo || '' }} | +
| 产品名称(PRODUCT): | +{{ certificate.productName || '' }} | +签发日期(DATE OF ISSUE): | +{{ formatDate(certificate.issueDate) || '' }} | +
| 序号 | +钢卷号 Coil No. |
+ 炉号 Heat No. |
+ 材质 Type |
+ 规格 Size (mm) |
+ 件数 Pieces |
+ 重量 Weight(t) |
+ 化学成分(%) Chemical Composition |
+ 拉伸试验 Tensile Test (G.L=80mm) |
+ 硬度试验 Hardness Test |
+ 弯曲试验 180° B.T D=0a |
+ 表面质量 | +表面结构 | +边缘状态 | +|||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| C | +Si | +Mn | +P | +S | +Als | +屈服 RP0.2 Y.S(MPa) |
+ 抗拉 T.S (MPa) |
+ 伸长率 EL (%) |
+ ||||||||||||
| {{ index + 1 }} | +{{ item.coilNo || '' }} | +{{ item.heatNo || '' }} | +{{ item.materialType || '' }} | +{{ item.size || '' }} | +{{ item.pieces || '' }} | +{{ item.weight || '' }} | +{{ item.c || '/' }} | +{{ item.si || '/' }} | +{{ item.mn || '/' }} | +{{ item.p || '/' }} | +{{ item.s || '/' }} | +{{ item.als || '/' }} | +{{ item.yieldStrength || '/' }} | +{{ item.tensileStrength || '/' }} | +{{ item.elongation || '/' }} | +{{ item.hardness || '/' }} | +{{ item.bendingTest || '/' }} | +{{ item.surfaceQuality || '/' }} | +{{ item.surfaceStructure || '/' }} | +{{ item.edgeStatus || '/' }} | +
| 暂无数据 | +||||||||||||||||||||
| 注释 NOTE |
+
+ {{ certificate.note || '/' }}
+ |
+
| 备注 REMARK |
+
+ {{ certificate.remark || '/' }}
+
+
+ 
+
+
+ 质量负责人:
+ 
+ |
+
+
+
+
+
+
+
diff --git a/klp-ui/src/views/mes/qc/certificate/components/templates/RawMaterialTemplate.vue b/klp-ui/src/views/mes/qc/certificate/components/templates/RawMaterialTemplate.vue
new file mode 100644
index 00000000..1bcdd7e2
--- /dev/null
+++ b/klp-ui/src/views/mes/qc/certificate/components/templates/RawMaterialTemplate.vue
@@ -0,0 +1,378 @@
+
+
+
+
+
+
+
+
+ 科伦普
+ KE LUN PU
+
+
+ 镀锌产品质量证明书
+ GALVANIZED PRODUCT QUALITY CERTIFICATE
+
+
+ 嘉祥科伦普重工有限公司
+ 山东省济宁市嘉祥县化工园区
+
+
+
+
+
+
+
+
+
+
+
+ | 执行标准(SPECIFICATION): | +{{ certificate.standard || '/' }} | +证明书号(CERTIFICATE NO.): | +{{ certificate.certificateNo || '' }} | +
| 收货单位(CONSIGNEE): | +{{ certificate.consignee || '-' }} | +合同号(CONTRACT NO.): | +{{ certificate.contractNo || '' }} | +
| 产品名称(PRODUCT): | +{{ certificate.productName || '' }} | +签发日期(DATE OF ISSUE): | +{{ formatDate(certificate.issueDate) || '' }} | +
| 序号 | +钢卷号 Coil No. |
+ 原料号 Material No. |
+ 材质 Type |
+ 规格 Size (mm) |
+ 件数 Pieces |
+ 重量 Weight(t) |
+ 化学成分(%) Chemical Composition |
+ 拉伸试验 Tensile Test (G.L=80mm) |
+ 镀层弯曲 B.T D=0a |
+ 表面质量 | +表面结构 | +镀层 表面结构 |
+ 表面处理 | +镀层重量COATINGMASS 锌层重量双面三点平均值 (g/m²) |
+ |||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| C | +Si | +Mn | +P | +S | +Als | +屈服 Y.S |
+ 抗拉 T.S |
+ 伸长率 EL |
+ |||||||||||||
| {{ index + 1 }} | +{{ item.coilNo || '' }} | +{{ item.rawCoilNo || '' }} | +{{ item.materialType || '' }} | +{{ item.size || '' }} | +{{ item.pieces || '' }} | +{{ item.weight || '' }} | +{{ item.c || '/' }} | +{{ item.si || '/' }} | +{{ item.mn || '/' }} | +{{ item.p || '/' }} | +{{ item.s || '/' }} | +{{ item.als || '/' }} | +{{ item.yieldStrength || '/' }} | +{{ item.tensileStrength || '/' }} | +{{ item.elongation || '/' }} | +{{ item.bendingTest || '/' }} | +{{ item.surfaceQuality || '/' }} | +{{ item.surfaceStructure || '/' }} | +{{ item.coatingSurfaceStructure || '/' }} | +{{ item.surfaceTreatment || '/' }} | +
+ {{ item.coatingMass || '/' }}
+ |
+
| 暂无数据 | +|||||||||||||||||||||
| 注释 NOTE |
+
+ {{ certificate.note || '/' }}
+ |
+
| 备注 REMARK |
+
+ {{ certificate.remark || '/' }}
+
+
+
+
+
+ 质量负责人:
+
+ |
+
+
+
+
+
+
+
diff --git a/klp-ui/src/views/mes/qc/certificate/components/templates/index.js b/klp-ui/src/views/mes/qc/certificate/components/templates/index.js
new file mode 100644
index 00000000..bf0c37f9
--- /dev/null
+++ b/klp-ui/src/views/mes/qc/certificate/components/templates/index.js
@@ -0,0 +1,20 @@
+import ChromiumTemplate from './ChromiumTemplate.vue';
+import GalvanizingTemplate from './GalvanizingTemplate.vue';
+import ColdHardTemplate from './ColdHardTemplate.vue';
+import RawMaterialTemplate from './RawMaterialTemplate.vue';
+
+export const templateMap = {
+ chromium: ChromiumTemplate,
+ galvanizing: GalvanizingTemplate,
+ coldHard: ColdHardTemplate,
+ rawMaterial: RawMaterialTemplate
+};
+
+export const templateOptions = [
+ { value: 'chromium', label: '镀铬质保书模版' },
+ { value: 'galvanizing', label: '镀锌质保书模版' },
+ { value: 'coldHard', label: '冷硬质保书模版' },
+ { value: 'rawMaterial', label: '原料质保书模版' }
+];
+
+export default templateMap;
diff --git a/klp-ui/src/views/mes/qc/certificate/item.vue b/klp-ui/src/views/mes/qc/certificate/item.vue
index 02a728b9..369a3093 100644
--- a/klp-ui/src/views/mes/qc/certificate/item.vue
+++ b/klp-ui/src/views/mes/qc/certificate/item.vue
@@ -106,6 +106,11 @@
+
+
+
+
+
+
+
+ 科伦普
+ KE LUN PU
+
+
+ 产品质量证明书
+ PRODUCT QUALITY CERTIFICATE
+
+
+ 嘉祥科伦普重工有限公司
+ 山东省济宁市嘉祥县化工园区
+
+
+
+
+
+
+
+
+
+
+
+ | 执行标准(SPECIFICATION): | +{{ certificate.standard || '/' }} | +证明书号(CERTIFICATE NO.): | +{{ certificate.certificateNo || '' }} | +
| 收货单位(CONSIGNEE): | +{{ certificate.consignee || '-' }} | +合同号(CONTRACT NO.): | +{{ certificate.contractNo || '' }} | +
| 产品名称(PRODUCT): | +{{ certificate.productName || '' }} | +签发日期(DATE OF ISSUE): | +{{ formatDate(certificate.issueDate) || '' }} | +
| 序号 | +钢卷号 Coil No. |
+ 炉号 Heat No. |
+ 材质 Type |
+ 规格 Size (mm) |
+ 件数 Pieces |
+ 重量 Weight(t) |
+ 化学成分(%) Chemical Composition |
+ 拉伸试验 Tensile Test (G.L=80mm) |
+ 硬度试验 Hardness Test |
+ 弯曲试验 180° B.T D=0a |
+ 表面质量 | +表面结构 | +边缘状态 | +规定塑性延伸强度 (MPa) |
+ 镀层表面结构 | +镀层重量 (g/m²) |
+ |||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| C | +Si | +Mn | +P | +S | +Als | +Al | +Ti | +Cr | +Ni | +Cu | +N | +Fe | +B | +屈服 RP0.2 Y.S(MPa) |
+ 抗拉 T.S (MPa) |
+ 伸长率 EL (%) |
+ |||||||||||||||
| {{ index + 1 }} | +{{ item.coilNo || '' }} | +{{ item.heatNo || '' }} | +{{ item.materialType || '' }} | +{{ item.size || '' }} | +{{ item.pieces || '' }} | +{{ item.weight || '' }} | +{{ item.c || '/' }} | +{{ item.si || '/' }} | +{{ item.mn || '/' }} | +{{ item.p || '/' }} | +{{ item.s || '/' }} | +{{ item.als || '/' }} | +{{ item.al || '/' }} | +{{ item.ti || '/' }} | +{{ item.cr || '/' }} | +{{ item.ni || '/' }} | +{{ item.cu || '/' }} | +{{ item.n || '/' }} | +{{ item.fe || '/' }} | +{{ item.b || '/' }} | +{{ item.yieldStrength || '/' }} | +{{ item.tensileStrength || '/' }} | +{{ item.elongation || '/' }} | +{{ item.hardness || '/' }} | +{{ item.bendingTest || '/' }} | +{{ item.surfaceQuality || '/' }} | +{{ item.surfaceStructure || '/' }} | +{{ item.edgeStatus || '/' }} | +{{ item.plasticExtensionStrength || '/' }} | +{{ item.coatingSurfaceStructure || '/' }} | +{{ item.coatingMass || '/' }} | +
| 暂无数据 | +|||||||||||||||||||||||||||||||
| 注释 NOTE |
+
+ {{ certificate.note || '/' }}
+ |
+
| 备注 REMARK |
+
+ {{ certificate.remark || '/' }}
+
+
+
+
+
+ 质量负责人:
+
+ |
+
+
+
+
+
+
+
+
+
+ {{ option.label }}
+
+