From d5990850e7600375c13da191afc094644ba306c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Sat, 10 Jan 2026 16:42:56 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E7=BB=9F=E4=B8=80=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8F=82=E6=95=B0=E5=91=BD=E5=90=8D=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BA=B5=E5=89=AA=E5=88=86=E6=9D=A1=E5=8E=9F=E6=96=99?=
 =?UTF-8?q?=E5=BA=93=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将接收、发货和轧后报表的时间参数从startTime/endTime统一改为byCreateTimeStart/byCreateTimeEnd
在轧后报表中添加纵剪分条原料库的数据查询
---
 klp-ui/src/views/wms/report/delivery.vue |  4 ++--
 klp-ui/src/views/wms/report/receive.vue  |  4 ++--
 klp-ui/src/views/wms/report/zha.vue      | 19 ++++++++++++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue
index 14c45ef5..e7aa726f 100644
--- a/klp-ui/src/views/wms/report/delivery.vue
+++ b/klp-ui/src/views/wms/report/delivery.vue
@@ -3,11 +3,11 @@
     <el-row>
       <el-form label-width="80px" inline>
         <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择开始时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择结束时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="入场钢卷号" prop="endTime">
diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue
index 07b073e1..c8e59db3 100644
--- a/klp-ui/src/views/wms/report/receive.vue
+++ b/klp-ui/src/views/wms/report/receive.vue
@@ -3,11 +3,11 @@
     <el-row>
       <el-form label-width="80px" inline>
         <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="入场钢卷号" prop="endTime">
diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue
index 10688934..ed913334 100644
--- a/klp-ui/src/views/wms/report/zha.vue
+++ b/klp-ui/src/views/wms/report/zha.vue
@@ -3,11 +3,11 @@
     <el-row>
       <el-form label-width="80px" inline>
         <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="入场钢卷号" prop="endTime">
@@ -189,9 +189,18 @@ export default {
           createBy: 'suanzhakuguan',
           warehouseId: '1988150545175736322'
         }),
-      ]).then(([res1, res2, res3]) => {
-        console.log(res1, res2, res3)
-        this.list = [...res1.rows, ...res2.rows, ...res3.rows]
+        // 酸连轧纵剪分条原料库1988150150521090049
+        listMaterialCoil({
+          ...this.queryParams,
+          pageSize: 9999,
+          pageNum: 1,
+          dataType: 1,
+          createBy: 'suanzhakuguan',
+          warehouseId: '1988150150521090049'
+        }),
+      ]).then(([res1, res2, res3, res4]) => {
+        console.log(res1, res2, res3, res4)
+        this.list = [...res1.rows, ...res2.rows, ...res3.rows, ...res4.rows]
         this.loading = false
       })
       // listPendingAction({