From b9da0d6d76ff43373af8e0b154a8234a522b8423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 3 Apr 2026 14:40:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在基板面板中新增发货单时间范围选择器，并调整后端接口以支持格式化日期参数
---
 klp-ui/src/views/wms/coil/panels/base.vue              | 10 ++++++++++
 .../controller/WmsDeliveryWaybillDetailController.java |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index ee7778f9..aa2da191 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -48,6 +48,11 @@
       <MaterialSelect :hideType="hideType" :itemId.sync="queryParams.itemIds" :itemType.sync="queryParams.itemType"
         :multiple="true" />
 
+      <el-form-item label="发货单时间">
+        <el-date-picker v-if="showWaybill" v-model="queryParams.shipmentTime" type="daterange" value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
+
       <el-form-item v-if="editNext" label="显示流程图" prop="showProcessFlow">
         <el-checkbox v-model="showProcessFlow" @change="handleShowProcessFlowChange"></el-checkbox>
       </el-form-item>
@@ -1006,6 +1011,11 @@ export default {
       // 如果没有设置itemType，则设置为raw_material
       query.selectType = this.querys.materialType === '原料' ? 'raw_material' : 'product';
       if (this.showWaybill) {
+        const { shipmentTime, ...query } = {
+          ...this.queryParams,
+          startTime: this.queryParams.shipmentTime?.[0],
+          endTime: this.queryParams.shipmentTime?.[1],
+        }
         listBoundCoil(query).then(res => {
           this.materialCoilList = res.rows || [];
           this.total = res.total;
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java
index 587b00ea..3130c895 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java
@@ -3,6 +3,7 @@ package com.klp.controller;
 import java.util.List;
 import java.util.Arrays;
 import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import com.klp.domain.vo.WmsMaterialCoilBindVo;
 import lombok.RequiredArgsConstructor;
@@ -119,8 +120,8 @@ public class WmsDeliveryWaybillDetailController extends BaseController {
     public TableDataInfo<WmsMaterialCoilBindVo> boundCoilList(
             WmsMaterialCoilBo bo,
             PageQuery pageQuery,
-            @RequestParam(required = false) Date startTime,
-            @RequestParam(required = false) Date endTime) {
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) {
         List<Long> boundCoilIds;
         if (startTime != null || endTime != null) {
             boundCoilIds = iWmsDeliveryWaybillDetailService.getBoundCoilIdsByTimeRange(startTime, endTime);