From fb6cb2b24e48a3d6120f170222a6b3dabe49f4ce Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Tue, 25 Nov 2025 16:31:04 +0800
Subject: [PATCH] 123

---
 .../PurchaseOrder/PurchaseOrderPageSearch.cs  | 14 ++++++++++++++
 .../PurchaseOrderRepository.cs                | 19 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/MyCode.Project.Domain/Message/Request/PurchaseOrder/PurchaseOrderPageSearch.cs b/MyCode.Project.Domain/Message/Request/PurchaseOrder/PurchaseOrderPageSearch.cs
index 68e83e3..4bec5ac 100644
--- a/MyCode.Project.Domain/Message/Request/PurchaseOrder/PurchaseOrderPageSearch.cs
+++ b/MyCode.Project.Domain/Message/Request/PurchaseOrder/PurchaseOrderPageSearch.cs
@@ -29,6 +29,20 @@ namespace MyCode.Project.Domain.Message.Request.PurchaseOrder
         /// </summary>           
         public DateTime? FDateEmd { get; set; }
 
+        /// <summary>
+        /// Desc:供应商承诺交期--开始
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? ChengNuoJiaoQiBegin { get; set; }
+
+        /// <summary>
+        /// Desc:供应商承诺交期--结束
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? ChengNuoJiaoQiEnd { get; set; }
+
         ///// <summary>
         ///// Desc:汇率类型
         ///// Default:
diff --git a/MyCode.Project.Repositories/PurchaseOrderRepository.cs b/MyCode.Project.Repositories/PurchaseOrderRepository.cs
index 4418daf..bec35c7 100644
--- a/MyCode.Project.Repositories/PurchaseOrderRepository.cs
+++ b/MyCode.Project.Repositories/PurchaseOrderRepository.cs
@@ -42,9 +42,26 @@ namespace MyCode.Project.Repositories
             }
             if (condition.FDateBegin.HasValue)
             {
-                DateTime begin = condition.FDateBegin.Value.AddDays(1).Date;
+                DateTime begin = condition.FDateBegin.Value.Date;
                 where.AddCondition("a.[FDate]", begin, SqlOperator.MoreThanOrEqual, true);
             }
+
+            if (condition.ChengNuoJiaoQiBegin.HasValue)
+            {
+                DateTime begin = condition.ChengNuoJiaoQiBegin.Value.Date;
+                where.AddCondition("b.[ChengNuoJiaoQi]", begin, SqlOperator.MoreThanOrEqual, true);
+            }
+
+
+            if (condition.ChengNuoJiaoQiEnd.HasValue)
+            {
+                DateTime end = condition.ChengNuoJiaoQiEnd.Value.AddDays(1).Date;
+                where.AddCondition("b.ChengNuoJiaoQi", end, SqlOperator.LessThan, true);
+            }
+
+         
+
+
             where.AddCondition("a.supplierId", supplierId, SqlOperator.Equal, !string.IsNullOrWhiteSpace( supplierId));
             where.AddCondition("a.FPurchaseOrgId", FPurchaseOrgId, SqlOperator.Equal, !string.IsNullOrWhiteSpace(FPurchaseOrgId) && FPurchaseOrgId != "-1");
             where.AddCondition("b.MaterialCode", condition.MaterialCode, SqlOperator.Like, !string.IsNullOrWhiteSpace(condition.MaterialCode));