From ed2a56cded0fc78a2606256e01aeb0820fd124cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Wed, 29 Oct 2025 15:20:14 +0800 Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E9=87=8D=E6=9E=84=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E8=BF=BD=E6=BA=AF=E5=8A=9F=E8=83=BD=E4=B8=BA=E7=8B=AC?= =?UTF-8?q?=E7=AB=8B=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat(wms): 新增钢卷追溯结果展示组件 fix(wms): 修正产品信息组件参数传递问题 style(sidebar): 调整菜单项边距样式 chore(config): 更新生产环境数据库配置 --- .../src/main/resources/application-prod.yml | 4 +- klp-ui/src/assets/styles/sidebar.scss | 7 +- .../views/wms/coil/panels/CoilTraceResult.vue | 409 +++++++++++++++++ klp-ui/src/views/wms/coil/panels/base.vue | 430 +----------------- 4 files changed, 429 insertions(+), 421 deletions(-) create mode 100644 klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue diff --git a/klp-admin/src/main/resources/application-prod.yml b/klp-admin/src/main/resources/application-prod.yml index cceed40d..ac0a944c 100644 --- a/klp-admin/src/main/resources/application-prod.yml +++ b/klp-admin/src/main/resources/application-prod.yml @@ -58,9 +58,9 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://140.143.206.120:3306/klp-oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true + url: jdbc:mysql://140.143.206.120:13306/klp-oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true username: klp - password: KeLunPu123@ + password: KeLunPu@123 # 从库数据源 slave: lazy: true diff --git a/klp-ui/src/assets/styles/sidebar.scss b/klp-ui/src/assets/styles/sidebar.scss index 21704bd1..51e94e39 100644 --- a/klp-ui/src/assets/styles/sidebar.scss +++ b/klp-ui/src/assets/styles/sidebar.scss @@ -99,7 +99,7 @@ white-space: nowrap !important; color: var(--text-regular); // 菜单项文本偏黑 border-radius: 4px; - margin: 0 6px; + margin: 0; transition: all 0.2s ease; } @@ -301,7 +301,6 @@ } } -#app .sidebar-container .el-menu-item, -#app .sidebar-container .el-submenu__title { - margin: 0; +#app .sidebar-container .nest-menu .el-submenu .el-submenu__title { + margin: 0 4px; } \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue b/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue new file mode 100644 index 00000000..b5dfcb42 --- /dev/null +++ b/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue @@ -0,0 +1,409 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 51ae798d..489aa8dc 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -11,12 +11,8 @@ - - 历史数据 - - - 当前数据 - + 历史数据 + 当前数据 @@ -70,7 +66,7 @@ @@ -319,6 +157,8 @@ import BomInfoMini from "@/components/KLPService/Renderer/BomInfoMini"; import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo"; import RightToolbar from "@/components/RightToolbar"; import Pagination from "@/components/Pagination"; +// 引入封装的追溯结果组件 +import CoilTraceResult from "./CoilTraceResult.vue"; // 路径根据实际存放位置调整 export default { name: "MaterialCoil", @@ -330,7 +170,8 @@ export default { RawMaterialInfo, BomInfoMini, RightToolbar, - Pagination + Pagination, + CoilTraceResult // 注册组件 }, props: { qrcode: { @@ -366,7 +207,7 @@ export default { open: false, // 追溯对话框显示 traceOpen: false, - // 追溯结果数据 + // 追溯结果数据（传递给组件） traceResult: null, // 查询参数 queryParams: { @@ -376,7 +217,6 @@ export default { enterCoilNo: undefined, currentCoilNo: undefined, supplierCoilNo: undefined, - dataType: 1, warehouseId: undefined, nextWarehouseId: undefined, qrcodeRecordId: undefined, @@ -407,38 +247,6 @@ export default { } }; }, - computed: { - // 按时间线和分支关系分组钢卷记录 - groupedRecords() { - if (!this.traceResult || !this.traceResult.records) { - return []; - } - - const groups = []; - // 按创建时间排序所有记录 - const sortedRecords = [...this.traceResult.records].sort((a, b) => - new Date(a.createTime) - new Date(b.createTime) - ); - - // 按数据类型分组，但保持时间顺序 - const currentCoils = sortedRecords.filter(record => record.dataType === 1); - const historyCoils = sortedRecords.filter(record => record.dataType === 0); - - // 当前数据分组 - if (currentCoils.length > 0) { - const currentByOperation = this.groupByOperation(currentCoils); - groups.push(...currentByOperation); - } - - // 历史数据分组 - if (historyCoils.length > 0) { - const historyByOperation = this.groupByOperation(historyCoils, true); - groups.push(...historyByOperation); - } - - return groups; - } - }, created() { this.getList(); }, @@ -455,71 +263,18 @@ export default { /** 追溯按钮操作 */ handleTrace(row) { this.traceOpen = true; - this.traceResult = null; - this.loading = true; + this.traceResult = null; // 清空历史数据 getMaterialCoilTrace({ enterCoilNo: row.enterCoilNo, currentCoilNo: row.currentCoilNo, }).then(res => { - this.traceResult = res.data; - console.log('溯源结果：', this.traceResult); - this.loading = false; + this.traceResult = res.data; // 将结果传递给组件 }).catch(err => { console.error('溯源查询失败：', err); this.$message.error('溯源查询失败，请重试'); - this.loading = false; }); }, - // 按操作类型分组 - groupByOperation(records, isHistory = false) { - const operationGroups = {}; - - for (const record of records) { - let operationType = '原始数据'; - let groupColor = 'default'; - - if (record.hasMergeSplit === 1) { - operationType = '分卷结果'; - groupColor = 'split'; - } else if (record.hasMergeSplit === 2) { - operationType = '合卷结果'; - groupColor = 'merge'; - } - - const groupKey = operationType; - if (!operationGroups[groupKey]) { - operationGroups[groupKey] = { - operationType: operationType, - groupColor: groupColor, - coils: [] - }; - } - operationGroups[groupKey].coils.push(record); - } - - // 转换为数组 - const groups = []; - for (const key in operationGroups) { - const group = operationGroups[key]; - groups.push({ - type: isHistory ? 'history' : 'current', - operationType: group.operationType, - groupColor: group.groupColor, - title: `${group.operationType}${isHistory ? '（历史）' : '（当前）'}`, - coils: group.coils - }); - } - - return groups; - }, - // 获取分组标签类型 - getGroupTypeTag(color) { - switch(color) { - case 'split': return 'warning'; - case 'merge': return 'success'; - default: return 'primary'; - } - }, + /** 下载二维码 */ handleDownloadQRCode(row) { try { saveAsImage( @@ -616,11 +371,7 @@ export default { this.title = "修改钢卷物料"; }); }, - - transferCoil() { - - }, - + transferCoil() {}, /** 提交按钮 */ submitForm() { this.$refs["form"].validate(valid => { @@ -669,155 +420,4 @@ export default { } } }; - - - \ No newline at end of file + \ No newline at end of file