From b474b250b54f08745037d8975163699a653405a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 9 Jan 2026 19:37:18 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E5=A2=9E=E5=8A=A0=E9=87=8D?=
 =?UTF-8?q?=E9=87=8F=E5=88=97=E5=B9=B6=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在delivery.vue和receive.vue中增加重量(吨)列
- 修改所有报表页面的时间范围默认为当天00:00:00至23:59:59
- 优化zha.vue的查询逻辑，改为从三个仓库并行获取数据
- 调整QR码尺寸从60增加到80
---
 .../LabelRender/ProductionTagPreview.vue      |  2 +-
 klp-ui/src/views/wms/report/delivery.vue      |  7 +-
 klp-ui/src/views/wms/report/receive.vue       |  9 +-
 klp-ui/src/views/wms/report/zha.vue           | 94 +++++++++++++------
 4 files changed, 75 insertions(+), 37 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
index 8ed52f20..aee47a08 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
@@ -40,7 +40,7 @@
           </div>
         </td>
         <td class="value-cell" colspan="1">
-          <QRCode :content="content.qrcodeRecordId || ' '" :size="60" />
+          <QRCode :content="content.qrcodeRecordId || ' '" :size="80" />
         </td>
       </tr>
        <!-- <tr>
diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue
index 2647cf36..0131fca0 100644
--- a/klp-ui/src/views/wms/report/delivery.vue
+++ b/klp-ui/src/views/wms/report/delivery.vue
@@ -37,6 +37,7 @@
           <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="exportTime" />
       <el-table-column label="更新人" align="center" prop="updateByName" />
@@ -60,8 +61,8 @@ export default {
     // 获取昨天0点到今天0点的时间范围
     const now = new Date()
     const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000)
-    const startTime = yesterday.toISOString().slice(0, 10) + ' 00:00:00'
-    const endTime = now.toISOString().slice(0, 10) + ' 00:00:00'
+    const startTime = now.toISOString().slice(0, 10) + ' 00:00:00'
+    const endTime = now.toISOString().slice(0, 10) + ' 23:59:59'
     return {
       list: [],
       queryParams: {
@@ -82,7 +83,7 @@ export default {
       const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
       return {
         totalCount,
-        totalWeight,
+        totalWeight: totalWeight.toFixed(2),
         avgWeight,
       }
     }
diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue
index b9a9c422..28bb1daa 100644
--- a/klp-ui/src/views/wms/report/receive.vue
+++ b/klp-ui/src/views/wms/report/receive.vue
@@ -12,7 +12,7 @@
 
     <el-descriptions title="统计信息" :column="3" border>
       <el-descriptions-item label="总钢卷数量">{{ summary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="总重">{{ summary.totalWeight.toFixed(2) }}t</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>
 
@@ -37,6 +37,7 @@
           <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="updateByName" />
     </el-table>
@@ -62,8 +63,8 @@ export default {
     // 获取昨天0点到今天0点的时间范围
     const now = new Date()
     const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000)
-    const startTime = yesterday.toISOString().slice(0, 10) + ' 00:00:00'
-    const endTime = yesterday.toISOString().slice(0, 10) + ' 23:59:59'
+    const startTime = now.toISOString().slice(0, 10) + ' 00:00:00'
+    const endTime = now.toISOString().slice(0, 10) + ' 23:59:59'
     return {
       list: [],
       queryParams: {
@@ -84,7 +85,7 @@ export default {
       const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
       return {
         totalCount,
-        totalWeight,
+        totalWeight: totalWeight.toFixed(2),
         avgWeight,
       }
     }
diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue
index 0674a6f8..26218005 100644
--- a/klp-ui/src/views/wms/report/zha.vue
+++ b/klp-ui/src/views/wms/report/zha.vue
@@ -6,13 +6,13 @@
         placeholder="选择开始时间"></el-date-picker>
       结束时间：<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
         placeholder="选择结束时间"></el-date-picker>
-      <el-button type="primary"  style="margin-left: 10px;" @click="getList">查询</el-button>
+      <el-button type="primary" style="margin-left: 10px;" @click="getList">查询</el-button>
       <el-button type="primary" @click="exportData">导出</el-button>
     </el-row>
 
     <el-descriptions title="统计信息" :column="3" border>
       <el-descriptions-item label="总钢卷数量">{{ summary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="总重">{{ summary.totalWeight.toFixed(2) }}t</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>
 
@@ -62,8 +62,8 @@ export default {
     // 获取昨天0点到今天0点的时间范围
     const now = new Date()
     const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000)
-    const startTime = yesterday.toISOString().slice(0, 10) + ' 00:00:00'
-    const endTime = yesterday.toISOString().slice(0, 10) + ' 23:59:59'
+    const startTime = now.toISOString().slice(0, 10) + ' 00:00:00'
+    const endTime = now.toISOString().slice(0, 10) + ' 23:59:59'
     return {
       list: [],
       queryParams: {
@@ -84,7 +84,7 @@ export default {
       const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
       return {
         totalCount,
-        totalWeight,
+        totalWeight: totalWeight.toFixed(2),
         avgWeight,
       }
     }
@@ -92,32 +92,68 @@ export default {
   methods: {
     getList() {
       this.loading = true
-      listPendingAction({
-        // actionStatus: 2,
-        actionType: 11,
-        pageSize: 999,
-        pageNum: 1,
-        startTime: this.queryParams.startTime,
-        endTime: this.queryParams.endTime,
-      }).then(res => {
-        const actions = res.rows
-        const coilIds = actions.map(item => item.coilId).join(',')
-        console.log(coilIds)
-        if (!coilIds) {
-          this.$message({
-            message: '暂无数据',
-            type: 'warning',
-          })
-          this.loading = false
-          return
-        }
+      Promise.all([
+        // 酸连轧成品库
         listMaterialCoil({
-          coilIds: coilIds,
-        }).then(res => {
-          this.list = res.rows
-          this.loading = false
-        })
+          startTime: this.queryParams.startTime,
+          endTime: this.queryParams.endTime,
+          pageSize: 9999,
+          pageNum: 1,
+          dataType: 1,
+          createBy: 'suanzhakuguan',
+          warehouseId: '1988150099140866050'
+        }),
+        // 镀锌原料库
+        listMaterialCoil({
+          startTime: this.queryParams.startTime,
+          endTime: this.queryParams.endTime,
+          pageSize: 9999,
+          pageNum: 1,
+          dataType: 1,
+          createBy: 'suanzhakuguan',
+          warehouseId: '1988150263284953089'
+        }),
+        // 脱脂原料库
+        listMaterialCoil({
+          startTime: this.queryParams.startTime,
+          endTime: this.queryParams.endTime,
+          pageSize: 9999,
+          pageNum: 1,
+          dataType: 1,
+          createBy: 'suanzhakuguan',
+          warehouseId: '1988150545175736322'
+        }),
+      ]).then(([res1, res2, res3]) => {
+        console.log(res1, res2, res3)
+        this.list = [...res1.rows, ...res2.rows, ...res3.rows]
+        this.loading = false
       })
+      // listPendingAction({
+      //   // actionStatus: 2,
+      //   actionType: 11,
+      //   pageSize: 999,
+      //   pageNum: 1,
+      //   startTime: this.queryParams.startTime,
+      //   endTime: this.queryParams.endTime,
+      // }).then(res => {
+      //   const actions = res.rows
+      //   const coilIds = actions.map(item => item.coilId).join(',')
+      //   console.log(coilIds)
+      //   if (!coilIds) {
+      //     this.$message({
+      //       message: '暂无数据',
+      //       type: 'warning',
+      //     })
+      //     this.loading = false
+      //     return
+      //   }
+      //   listMaterialCoil({
+      //     coilIds: coilIds,
+      //   }).then(res => {
+      //     this.list = res.rows
+      //     this.loading = false
+      //   })
+      // })
     },
     // 导出
     exportData() {