From aa8328c5d35ecaae5c372f3ccf7661630ac44f8f Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Fri, 15 Aug 2025 17:41:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=8E=92=E4=BA=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=A2=9E=E5=8A=A0=E8=AE=A1=E5=88=92=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsSchedulePlan 和 WmsSchedulePlanBo 类中添加 startDate 和 endDate 字段
- 更新相关服务方法，支持新增的计划开始日期和结束日期功能
- 注释掉查询排产计划总的开始结束时间的代码块
---
 .../main/java/com/klp/domain/WmsSchedulePlan.java  | 12 ++++++++++++
 .../java/com/klp/domain/bo/WmsSchedulePlanBo.java  | 14 ++++++++++++++
 .../service/impl/WmsSchedulePlanServiceImpl.java   |  4 ++--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/WmsSchedulePlan.java b/klp-wms/src/main/java/com/klp/domain/WmsSchedulePlan.java
index b142c04c..85aec8e0 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsSchedulePlan.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsSchedulePlan.java
@@ -1,10 +1,13 @@
 package com.klp.domain;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.*;
 import com.klp.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 
 /**
  * 排产计划对象 wms_schedule_plan
@@ -60,4 +63,13 @@ public class WmsSchedulePlan extends BaseEntity {
 //     * 工艺路线
 //     */
 //    private String processRoute;
+
+    /**
+     * 计划开始日期
+     */
+    private Date startDate;
+    /**
+     * 计划结束日期
+     */
+    private Date endDate;
 }
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsSchedulePlanBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsSchedulePlanBo.java
index 44eaacd3..afd06c38 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsSchedulePlanBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsSchedulePlanBo.java
@@ -1,9 +1,11 @@
 package com.klp.domain.bo;
 
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.klp.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
+import java.util.Date;
 
 
 /**
@@ -52,6 +54,18 @@ public class WmsSchedulePlanBo extends BaseEntity {
      */
     private Long priority;
 
+    /**
+     * 计划开始日期
+     */
+    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+    private Date startDate;
+
+    /**
+     * 计划结束日期
+     */
+    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+    private Date endDate;
+
 //    /**
 //     * 工艺路线
 //     */
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsSchedulePlanServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsSchedulePlanServiceImpl.java
index 9a07ebb3..50574923 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsSchedulePlanServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsSchedulePlanServiceImpl.java
@@ -54,7 +54,7 @@ public class WmsSchedulePlanServiceImpl implements IWmsSchedulePlanService {
     public TableDataInfo<WmsSchedulePlanVo> queryPageList(WmsSchedulePlanBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<WmsSchedulePlan> lqw = buildQueryWrapper(bo);
         Page<WmsSchedulePlanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        // 查排产计划总的开始结束时间
+        /*// 查排产计划总的开始结束时间
         // 获取所有planId
         List<Long> planIds = result.getRecords().stream()
             .map(WmsSchedulePlanVo::getPlanId)
@@ -72,7 +72,7 @@ public class WmsSchedulePlanServiceImpl implements IWmsSchedulePlanService {
                     vo.setEndDate(agg.getEndDate());
                 }
             }
-        }
+        }*/
         return TableDataInfo.build(result);
     }