From 4478921d9b96edb5a44e71f113861f8f53c6d352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 20 Mar 2026 17:56:08 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8A=A5=E8=A1=A8):=20=E5=A2=9E=E5=BC=BA?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增镀锌1预填接口和报表字段
- 优化标签材质显示逻辑，移除content前缀
- 增加报表分页大小选项和耗时格式化
- 扩展报表可选列和默认列配置
- 改进报表统计计算逻辑，考虑质量状态
- 调整报表页面大小限制为99999
---
 klp-ui/src/api/pocket/acidTyping.js           |  7 ++++
 .../wms/coil/panels/LabelRender/DuGeTag.vue   |  2 +-
 .../coil/panels/LabelRender/GalvanizedTag.vue |  2 +-
 .../panels/LabelRender/OuterTagPreview.vue    |  2 +-
 .../wms/report/components/coilTable/index.vue | 25 ++++++++++++
 .../wms/report/components/setting/columns.vue |  7 ++++
 klp-ui/src/views/wms/report/js/calc.js        | 38 +++++++++++--------
 klp-ui/src/views/wms/report/js/column.js      | 25 ++++++++++++
 .../wms/report/template/comprehensive.vue     |  7 +++-
 klp-ui/src/views/wms/report/template/year.vue |  4 +-
 10 files changed, 96 insertions(+), 23 deletions(-)

diff --git a/klp-ui/src/api/pocket/acidTyping.js b/klp-ui/src/api/pocket/acidTyping.js
index 8cebf1d7..51963846 100644
--- a/klp-ui/src/api/pocket/acidTyping.js
+++ b/klp-ui/src/api/pocket/acidTyping.js
@@ -8,3 +8,10 @@ export function getAcidTypingPrefill(currentCoilNo) {
   })
 }
 
+export function getGalvanize1TypingPrefill(currentCoilNo) {
+  return request({
+    url: '/pocket/galvanize1/crmPdoExcoil/list',
+    method: 'get',
+    params: { currentCoilNo }
+  })
+}
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
index a8e181f6..13f433ee 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
@@ -54,7 +54,7 @@
         <!-- 第四行：材质 + 表面质量 -->
         <div class="info-grid-item label-cell">材质</div>
         <div class="info-grid-item value-cell">
-          <div class="nob">{{ content.materialWithManufacturer || '' }}</div>
+          <div class="nob">{{ materialWithManufacturer || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">表面状态</div>
         <div class="info-grid-item value-cell">
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
index c63f92ce..62fc0eda 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
@@ -54,7 +54,7 @@
         <!-- 第四行：材质 + 表面质量 -->
         <div class="info-grid-item label-cell">材质</div>
         <div class="info-grid-item value-cell">
-          <div class="nob">{{ content.materialWithManufacturer || '' }}</div>
+          <div class="nob">{{ materialWithManufacturer || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">镀层种类</div>
         <div class="info-grid-item value-cell">
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
index bd71f9d0..cf4f8b31 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
@@ -60,7 +60,7 @@
         <!-- 第四行：材质 + 表面质量 -->
         <div class="info-grid-item label-cell">材质</div>
         <div class="info-grid-item value-cell">
-          <div class="nob">{{ content.materialWithManufacturer || '' }}</div>
+          <div class="nob">{{ materialWithManufacturer || '' }}</div>
           <!-- <input type="text" class="nob" :value="content.materialWithManufacturer || ''" /> -->
         </div>
         <div class="info-grid-item label-cell">质量要求</div>
diff --git a/klp-ui/src/views/wms/report/components/coilTable/index.vue b/klp-ui/src/views/wms/report/components/coilTable/index.vue
index 5bd75853..3d93d4ac 100644
--- a/klp-ui/src/views/wms/report/components/coilTable/index.vue
+++ b/klp-ui/src/views/wms/report/components/coilTable/index.vue
@@ -18,6 +18,10 @@
           <template v-else-if="column.prop === 'status'">
             {{ scope.row.status === 0 ? '在库' : '已出库' }}
           </template>
+          <!-- 生产耗时，单位分钟，渲染为xx天xx小时xx分钟 -->
+          <template v-else-if="column.prop === 'productionDuration'">
+            {{ formatProductionDuration(scope.row.productionDuration) }}
+          </template>
           <!-- 默认渲染 -->
           <template v-else>
             {{ scope.row[column.prop] }}
@@ -30,6 +34,7 @@
       layout="total, sizes, prev, pager, next, jumper"
       :total="total"
       :page-size.sync="pageSize"
+      :page-sizes="[10, 20, 50, 100, 200, 500, 1000]"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     />
@@ -92,6 +97,26 @@ export default {
     handleCurrentChange(val) {
       this.pageNum = val
     },
+    // 生产耗时，单位分钟，渲染为xx天xx小时xx分钟
+    formatProductionDuration(duration) {
+      if (!duration || isNaN(duration)) {
+        return '0分钟'
+      }
+      const days = Math.floor(duration / 1440)
+      const hours = Math.floor((duration - days * 1440) / 60)
+      const minutes = duration - days * 1440 - hours * 60
+      let result = ''
+      if (days > 0) {
+        result += `${days}天`
+      }
+      if (hours > 0) {
+        result += `${hours}小时`
+      }
+      if (minutes > 0 || (days === 0 && hours === 0)) {
+        result += `${minutes}分钟`
+      }
+      return result
+    }
   }
 }
 </script>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/report/components/setting/columns.vue b/klp-ui/src/views/wms/report/components/setting/columns.vue
index 353fcc4b..aadf29f6 100644
--- a/klp-ui/src/views/wms/report/components/setting/columns.vue
+++ b/klp-ui/src/views/wms/report/components/setting/columns.vue
@@ -136,8 +136,15 @@ export default {
       optionalProps: [
         { label: '入场钢卷号', value: 'enterCoilNo' },
         { label: '当前钢卷号', value: 'currentCoilNo' },
+        { label: '厂家钢卷号', value: 'supplierCoilNo' },
         { label: '逻辑库区', value: 'warehouseName' },
         { label: '实际库区', value: 'actualWarehouseName' },
+
+        { label: '质量状态', value: 'qualityStatus' },
+        { label: '切边要求', value: 'trimmingRequirement' },
+        { label: '打包状态', value: 'packingStatus' },
+        { label: '包装要求', value: 'packagingRequirement' },
+
         { label: '产品类型', value: 'itemId' },
         { label: '品名', value: 'itemName' },
         { label: '宽度', value: 'computedWidth' },
diff --git a/klp-ui/src/views/wms/report/js/calc.js b/klp-ui/src/views/wms/report/js/calc.js
index a4986f77..a35d6d1d 100644
--- a/klp-ui/src/views/wms/report/js/calc.js
+++ b/klp-ui/src/views/wms/report/js/calc.js
@@ -59,11 +59,11 @@ const calcAbSummary = (list) => {
     returnWeight: 0,
 
     // 计入技术部的钢卷占比
-    jishuRate: 0,   
+    jishuRate: 0,
     // 计入小钢卷库的钢卷占比
-    miniRate: 0,   
+    miniRate: 0,
     // 计入废品库的钢卷占比
-    rubbishRate: 0, 
+    rubbishRate: 0,
     // 计入退货库的钢卷占比
     returnRate: 0,
   }
@@ -76,22 +76,28 @@ const calcAbSummary = (list) => {
     // 技术部
     const coil = list[i];
     // 技术部
-    if (coil.warehouseId == '2019583656787259393') {
+    if (coil.warehouseId == '2019583656787259393' || coil.qualityStatus == 'O') {
       o['jishuCount'] = o['jishuCount'] + 1
       o['jishuWeight'] = o['jishuWeight'] + parseFloat(coil.netWeight) || 0
     }
     // 小刚卷库
-    if (coil.warehouseId == '2019583325311414274') {
+    else if (coil.warehouseId == '2019583325311414274') {
       o['miniCount'] = o['miniCount'] + 1
       o['miniWeight'] = o['miniWeight'] + parseFloat(coil.netWeight) || 0
     }
-    // 废品库
-    if (coil.warehouseId == '2019583429955104769') {
+    // 废品库, 或者之状态为D-,D，D+,C-，C，C+其中之一
+    else if (coil.warehouseId == '2019583429955104769'
+      || coil.qualityStatus == 'D-' ||
+      coil.qualityStatus == 'D' ||
+      coil.qualityStatus == 'D+' ||
+      coil.qualityStatus == 'C-' ||
+      coil.qualityStatus == 'C' ||
+      coil.qualityStatus == 'C+') {
       o['rubbishCount'] = o['rubbishCount'] + 1
       o['rubbishWeight'] = o['rubbishWeight'] + parseFloat(coil.netWeight) || 0
     }
     // 退货库
-    if (coil.warehouseId == '2019583137616310273') {
+    else if (coil.warehouseId == '2019583137616310273') {
       o['returnCount'] = o['returnCount'] + 1
       o['returnWeight'] = o['returnWeight'] + parseFloat(coil.netWeight) || 0
     }
@@ -133,35 +139,35 @@ const calcTeamSummary = (list) => {
 
 const calcMSummary = (list, lossList) => {
   // 统计，需要二外处理M卷，也就是钢卷的currentCoilNo中带有M的钢卷，在统计产出钢卷的数量和重量时需要忽略并记录，并且在统计消耗钢卷的总重量时也需要移除
-  
+
   // 筛选出 M 卷
   const mCoils = list.filter(item => item.currentCoilNo && item.currentCoilNo.includes('M'))
   // 非 M 卷
   const nonMCoils = list.filter(item => !item.currentCoilNo || !item.currentCoilNo.includes('M'))
-  
+
   // 非 M 卷作为产出统计
   const outCount = nonMCoils.length
   const outTotalWeight = nonMCoils.reduce((acc, cur) => acc + (parseFloat(cur.netWeight) || 0), 0)
   const outAvgWeight = outCount > 0 ? (outTotalWeight / outCount)?.toFixed(2) : 0
-  
+
   // 计算产出的 M 卷总重量
   const mOutTotalWeight = mCoils.reduce((acc, cur) => acc + (parseFloat(cur.netWeight) || 0), 0)
-  
+
   // 消耗钢卷统计（数量包括所有卷，但总重量减去产出的 M 卷重量）
   const lossCount = lossList.length
   const lossTotalWeight = lossList.reduce((acc, cur) => acc + (parseFloat(cur.netWeight) || 0), 0) - mOutTotalWeight
   const lossAvgWeight = lossCount > 0 ? (lossTotalWeight / lossCount)?.toFixed(2) : 0
-  
+
   // 合计
   const totalCount = outCount + lossCount
   const totalWeight = parseFloat((outTotalWeight + lossTotalWeight).toFixed(2))
   const totalAvgWeight = totalCount > 0 ? (totalWeight / totalCount)?.toFixed(2) : 0
-  
+
   // 成品比率
   const passRate = outCount > 0 && lossTotalWeight > 0 ? (outTotalWeight / lossTotalWeight) : 0
   // 损失比率
   const lossRate = totalCount > 0 ? (1 - passRate) : 0
-  
+
   // 异常率,成品在warehouseId在'2019583656787259393',
   // '2019583325311414274',
   // '2019583429955104769',
@@ -172,7 +178,7 @@ const calcMSummary = (list, lossList) => {
 
   // 正品率（1-异常率）
   const passRate2 = totalCount != 0 ? (1 - abRate) : 0
-  
+
   return {
     outCount,
     outTotalWeight: outTotalWeight.toFixed(2),
diff --git a/klp-ui/src/views/wms/report/js/column.js b/klp-ui/src/views/wms/report/js/column.js
index 9a35b44c..b82fd7ff 100644
--- a/klp-ui/src/views/wms/report/js/column.js
+++ b/klp-ui/src/views/wms/report/js/column.js
@@ -26,6 +26,16 @@ const defaultColumns = {
       prop: "productionEndTime",
       align: "center",
     },
+    {
+      title: "生产耗时",
+      prop: "productionDuration",
+      align: "center",
+    },
+    {
+      title: '质量状态',
+      prop: 'qualityStatus',
+      align: 'center'
+    },
     {
       title: "逻辑库区",
       prop: "warehouseName",
@@ -92,6 +102,11 @@ const defaultColumns = {
       prop: "warehouseName",
       align: "center",
     },
+    {
+      title: '质量状态',
+      prop: 'qualityStatus',
+      align: 'center'
+    },
     {
       title: "产品类型",
       prop: "itemId",
@@ -148,6 +163,11 @@ const defaultColumns = {
       prop: "warehouseName",
       align: "center",
     },
+    {
+      title: '质量状态',
+      prop: 'qualityStatus',
+      align: 'center'
+    },
     {
       title: "产品类型",
       prop: "itemId",
@@ -209,6 +229,11 @@ const defaultColumns = {
       prop: "warehouseName",
       align: "center",
     },
+    {
+      title: '质量状态',
+      prop: 'qualityStatus',
+      align: 'center'
+    },
     {
       title: "产品类型",
       prop: "itemId",
diff --git a/klp-ui/src/views/wms/report/template/comprehensive.vue b/klp-ui/src/views/wms/report/template/comprehensive.vue
index 7ed1e539..aaa01da1 100644
--- a/klp-ui/src/views/wms/report/template/comprehensive.vue
+++ b/klp-ui/src/views/wms/report/template/comprehensive.vue
@@ -222,7 +222,7 @@ export default {
       lossList: [],
       queryParams: {
         pageNum: 1,
-        pageSize: 9999,
+        pageSize: 99999,
         date: currentDate,  // 绑定日期选择器的默认值（当天）
         byCreateTimeStart: start,  // 默认当天0点
         byCreateTimeEnd: end,      // 默认当天23:59:59
@@ -250,6 +250,8 @@ export default {
 
       lossColumns: [],
       outputColumns: [],
+
+      actionIds: '',
     }
   },
   watch: {
@@ -335,7 +337,7 @@ export default {
           actionStatus: 2,
           warehouseId: this.queryParams.planId,
           actionType,
-          pageSize: 9999,
+          pageSize: 99999,
           pageNum: 1,
           startTime: this.queryParams.byCreateTimeStart,
           endTime: this.queryParams.byCreateTimeEnd,
@@ -343,6 +345,7 @@ export default {
         })
       }))
       const actions = resultList.flatMap(item => item.rows)
+      this.actionIds = actions.map(item => item.actionId).join(',')
       const coilIds = actions.map(item => item.coilId).join(',')
       console.log(coilIds)
       if (!coilIds) {
diff --git a/klp-ui/src/views/wms/report/template/year.vue b/klp-ui/src/views/wms/report/template/year.vue
index 67fff3fd..de4b0953 100644
--- a/klp-ui/src/views/wms/report/template/year.vue
+++ b/klp-ui/src/views/wms/report/template/year.vue
@@ -197,7 +197,7 @@ export default {
       lossList: [],
       queryParams: {
         pageNum: 1,
-        pageSize: 9999,
+        pageSize: 99999,
         date: currentDate,  // 绑定日期选择器的默认值（当天）
         byCreateTimeStart: start,  // 默认当天0点
         byCreateTimeEnd: end,      // 默认当天23:59:59
@@ -313,7 +313,7 @@ export default {
           actionStatus: 2,
           warehouseId: this.queryParams.planId,
           actionType,
-          pageSize: 9999,
+          pageSize: 99999,
           pageNum: 1,
           startTime: this.queryParams.byCreateTimeStart,
           endTime: this.queryParams.byCreateTimeEnd,