From a9b59678de474840bf19f25559d15b98daf20c25 Mon Sep 17 00:00:00 2001
From: git_rabbit <zhaozhengyi1b@126.com>
Date: Sat, 7 Feb 2026 12:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MES/Order/DeliveryScheduleController.cs    |  2 --
 .../MES/Order/DeliveryScheduleService.cs       | 18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/Order/DeliveryScheduleController.cs b/DOAN.Admin.WebApi/Controllers/MES/Order/DeliveryScheduleController.cs
index 6587ec5..9fa19c4 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/Order/DeliveryScheduleController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/Order/DeliveryScheduleController.cs
@@ -36,8 +36,6 @@ namespace DOAN.Admin.WebApi.Controllers
         [ActionPermissionFilter(Permission = "orderpurchase:list")]
         public IActionResult QueryOrderPurchase([FromBody] OrderPurchaseQueryDto parm)
         {
-            parm.ImportDate[0]= DOANConvertDate.ConvertLocalDate(parm.ImportDate[0]);
-            parm.ImportDate[1]= DOANConvertDate.ConvertLocalDate(parm.ImportDate[1]);
             var response = _deliveryScheduleService.GetList(parm);
             return SUCCESS(response);
         }
diff --git a/DOAN.Service/MES/Order/DeliveryScheduleService.cs b/DOAN.Service/MES/Order/DeliveryScheduleService.cs
index 90adf07..2e0963e 100644
--- a/DOAN.Service/MES/Order/DeliveryScheduleService.cs
+++ b/DOAN.Service/MES/Order/DeliveryScheduleService.cs
@@ -5,6 +5,7 @@ using DOAN.Model.MES.product;
 using DOAN.Service.MES.order.IService;
 using DOAN.Service.MES.Order.IService;
 using Infrastructure.Attribute;
+using Infrastructure.Converter;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -23,12 +24,24 @@ namespace DOAN.Service.MES.Order
         /// <returns></returns>
         public List<OrderScheduleDto> GetList(OrderPurchaseQueryDto parm)
         {
+            // 日期处理
+            if (parm != null && parm.ImportDate != null && parm.ImportDate.Length > 0)
+            {
+                if (parm.ImportDate[0] > DateTime.MinValue)
+                {
+                    parm.ImportDate[0] = DOANConvertDate.ConvertLocalDate(parm.ImportDate[0]);
+                }
+                if (parm.ImportDate[1] > DateTime.MinValue)
+                {
+                    parm.ImportDate[1] = DOANConvertDate.ConvertLocalDate(parm.ImportDate[1]);
+                }
+            }
             var predicate = QueryExp(parm);
             var queryResult = Context.Queryable<OrderPurchase>()
                 .LeftJoin<ProWorkorder>((o, w) => o.OrderNoMes == w.CustomerOrder)
                 .Where(predicate.ToExpression())
                 .Where((o, w) => !SqlFunc.IsNullOrEmpty(o.OrderNoMes))
-                .OrderBy((o, w) => o.Id)
+                .OrderBy((o, w) => o.OrderNoMes)
                 .Select((o, w) => new OrderScheduleDto
                 {
                     Id = o.Id,
@@ -75,9 +88,10 @@ namespace DOAN.Service.MES.Order
             var predicate = Expressionable.Create<OrderPurchase, ProWorkorder>()
                 .AndIF(!string.IsNullOrEmpty(parm.OrderNoMes), (o, w) => o.OrderNoMes.Contains(parm.OrderNoMes))
                 .AndIF(!string.IsNullOrEmpty(parm.PurchaseOrderErp), (o, w) => o.PurchaseOrderErp.Contains(parm.PurchaseOrderErp))
+                .AndIF(!string.IsNullOrEmpty(parm.MaterialCode), (o, w) => o.MaterialCode.Contains(parm.MaterialCode))
                 .AndIF(parm.ImportDate != null && parm.ImportDate[0] > DateTime.MinValue, (o, w) => o.ImportDate >= parm.ImportDate[0])
                 .AndIF(parm.ImportDate != null && parm.ImportDate[1] > DateTime.MinValue, (o, w) => o.ImportDate <= parm.ImportDate[1])
-                .AndIF(parm.Orderindicator>-1,(o,w)=>o.Orderindicator==parm.Orderindicator)
+                .AndIF(parm.Orderindicator>-2,(o,w)=>o.Orderindicator==parm.Orderindicator)
 
                 ;