From 693edbb54385d79a0c1663266e84777fdf45eaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 9 Mar 2026 13:06:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E7=83=AD?= =?UTF-8?q?=E8=BD=A7=E5=8E=9F=E6=96=99=E5=BA=93=E5=AD=98=E9=80=8F=E8=A7=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=8A=E7=9B=B8=E5=85=B3=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加热轧原料库存透视表API接口 创建透视表展示组件HotZhaRaw.vue和Perspective.vue 实现数据持久化功能及左右布局管理界面 优化锌卷标签显示样式及字段名称 --- klp-ui/src/api/wms/coilStatisticsSummary.js | 44 +++ klp-ui/src/api/wms/rawMaterial.js | 10 + .../coil/panels/LabelRender/ZincRawTag.vue | 12 +- .../wms/coil/panels/Perspective/HotZhaRaw.vue | 175 ++++++++++ .../wms/coil/panels/Perspective/index.vue | 48 +++ .../coil/perspective/components/LeftList.vue | 320 ++++++++++++++++++ .../src/views/wms/coil/perspective/index.vue | 241 +++++++++++++ 7 files changed, 844 insertions(+), 6 deletions(-) create mode 100644 klp-ui/src/api/wms/coilStatisticsSummary.js create mode 100644 klp-ui/src/views/wms/coil/panels/Perspective/HotZhaRaw.vue create mode 100644 klp-ui/src/views/wms/coil/panels/Perspective/index.vue create mode 100644 klp-ui/src/views/wms/coil/perspective/components/LeftList.vue create mode 100644 klp-ui/src/views/wms/coil/perspective/index.vue diff --git a/klp-ui/src/api/wms/coilStatisticsSummary.js b/klp-ui/src/api/wms/coilStatisticsSummary.js new file mode 100644 index 00000000..b4ee3a6c --- /dev/null +++ b/klp-ui/src/api/wms/coilStatisticsSummary.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询钢卷生产统计汇总(数据透视结果持久化)列表 +export function listCoilStatisticsSummary(query) { + return request({ + url: '/wms/coilStatisticsSummary/list', + method: 'get', + params: query + }) +} + +// 查询钢卷生产统计汇总(数据透视结果持久化)详细 +export function getCoilStatisticsSummary(summaryId) { + return request({ + url: '/wms/coilStatisticsSummary/' + summaryId, + method: 'get' + }) +} + +// 新增钢卷生产统计汇总(数据透视结果持久化) +export function addCoilStatisticsSummary(data) { + return request({ + url: '/wms/coilStatisticsSummary', + method: 'post', + data: data + }) +} + +// 修改钢卷生产统计汇总(数据透视结果持久化) +export function updateCoilStatisticsSummary(data) { + return request({ + url: '/wms/coilStatisticsSummary', + method: 'put', + data: data + }) +} + +// 删除钢卷生产统计汇总(数据透视结果持久化) +export function delCoilStatisticsSummary(summaryId) { + return request({ + url: '/wms/coilStatisticsSummary/' + summaryId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/wms/rawMaterial.js b/klp-ui/src/api/wms/rawMaterial.js index ba1b8148..388f6535 100644 --- a/klp-ui/src/api/wms/rawMaterial.js +++ b/klp-ui/src/api/wms/rawMaterial.js @@ -67,3 +67,13 @@ export function listRawMaterialWithBom(query) { params: query }) } + +/** + * 热轧原料库存透视表 + */ +export function listRawMaterialPerspective() { + return request({ + url: '/wms/rawMaterial/statistics', + method: 'get', + }) +} diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue index 7d949571..ba5277da 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue @@ -37,11 +37,11 @@
包装要求
-
{{ content.packagingRequirements || '' }}
+
{{ content.packagingRequirement || '' }}
切边要求
-
{{ content.trimmingRequirements || '' }}
+
{{ content.trimmingRequirement || '' }}
@@ -192,7 +192,7 @@ export default { .grid-cell { border: 1px solid #333; padding: 4px; - font-size: 14px; + font-size: 20px; box-sizing: border-box; text-align: center; word-break: break-all; @@ -205,14 +205,14 @@ export default { /* 公司名称单元格 */ .company-cell { grid-column: span 4; /* 跨4列 */ - font-size: 18px; + font-size: 24px; font-weight: bold; - background-color: #f5f5f5; + /* background-color: #f5f5f5; */ } /* 标签单元格(左) */ .label-cell { - background-color: #f5f5f5; + /* background-color: #f5f5f5; */ font-weight: bold; } diff --git a/klp-ui/src/views/wms/coil/panels/Perspective/HotZhaRaw.vue b/klp-ui/src/views/wms/coil/panels/Perspective/HotZhaRaw.vue new file mode 100644 index 00000000..ed4145fc --- /dev/null +++ b/klp-ui/src/views/wms/coil/panels/Perspective/HotZhaRaw.vue @@ -0,0 +1,175 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/panels/Perspective/index.vue b/klp-ui/src/views/wms/coil/panels/Perspective/index.vue new file mode 100644 index 00000000..f404f3be --- /dev/null +++ b/klp-ui/src/views/wms/coil/panels/Perspective/index.vue @@ -0,0 +1,48 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/perspective/components/LeftList.vue b/klp-ui/src/views/wms/coil/perspective/components/LeftList.vue new file mode 100644 index 00000000..d8a8b1ac --- /dev/null +++ b/klp-ui/src/views/wms/coil/perspective/components/LeftList.vue @@ -0,0 +1,320 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/perspective/index.vue b/klp-ui/src/views/wms/coil/perspective/index.vue new file mode 100644 index 00000000..60bcca5d --- /dev/null +++ b/klp-ui/src/views/wms/coil/perspective/index.vue @@ -0,0 +1,241 @@ + + + From f389576c92b4830be717c8116cad4fbe47448287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 9 Mar 2026 13:24:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0):?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E9=95=80=E9=94=8C=E5=8E=9F=E6=96=99?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=B1=BB=E5=9E=8B=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在LabelRender组件中新增类型5的标签尺寸配置 - 修改ZincRawTag组件中下工序默认值为'镀锌卷' - 在do.vue中新增标签尺寸映射并实现根据物料类型和仓库自动选择标签类型 --- .../coil/panels/LabelRender/ZincRawTag.vue | 2 +- .../wms/coil/panels/LabelRender/index.vue | 4 ++ klp-ui/src/views/wms/coil/panels/do.vue | 47 +++++++++++++++++-- 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue index ba5277da..d8c78ee0 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue @@ -31,7 +31,7 @@
下工序
-
{{ content.nextProcess || '冷硬卷' }}
+
{{ content.nextProcess || '镀锌卷' }}
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue index e57329f7..fbdee04c 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue @@ -91,6 +91,10 @@ export default { width: 100, height: 80, }, + '5': { + width: 180, + height: 100, + }, } } }, diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue index b7217e23..d5e00823 100644 --- a/klp-ui/src/views/wms/coil/panels/do.vue +++ b/klp-ui/src/views/wms/coil/panels/do.vue @@ -246,8 +246,7 @@
品名: - +
@@ -273,7 +272,7 @@ {{ item.manufacturer }}
- +
{{ item.itemName || '—' }} @@ -552,6 +551,28 @@ export default { defectCode: null, degree: null, remark: null + }, + tagSizeMap: { + '2': { + width: 100, + height: 80, + }, + '3': { + width: 180, + height: 100, + }, + '4': { + width: 180, + height: 100, + }, + 'where': { + width: 100, + height: 80, + }, + '5': { + width: 180, + height: 100, + }, }, stepSpilt: { list: [], @@ -633,8 +654,24 @@ export default { handlePrintLabel(row) { const item = row.itemType === 'product' ? row.product : row.rawMaterial; const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || ''; - - this.labelRender.type = row.itemType === 'product' ? '3' : '2' + const itemType = row.itemType || ''; + const warehouseId = row.warehouseId || ''; + // 在镀锌颜料库的卷使用镀锌原料标签 + if (itemType == 'raw_material' && warehouseId == '1988150263284953089') { + this.labelRender.type = '5'; + } else if (itemType == 'raw_material') { + this.labelRender.type = '2'; + } else if (itemType == 'product' && itemName == '冷硬卷') { + this.labelRender.type = '3'; + } else if (itemType == 'product' && itemName == '热轧卷板') { + this.labelRender.type = '3'; + } else if (itemType == 'product' && itemName == '镀锌卷') { + this.labelRender.type = '4'; + } else if (itemType == 'product' && itemName == '冷轧卷') { + this.labelRender.type = '3'; + } else { + this.labelRender.type = '3'; + } this.labelRender.data = { ...row, itemName: itemName,