From aa2b0501a5540d111d611a2d1fb3c31e6cda5eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E4=B8=9C?= <17363321594@163.com>
Date: Fri, 26 Sep 2025 15:11:14 +0800
Subject: [PATCH] =?UTF-8?q?MRP=E7=89=A9=E6=96=99=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MES/mm/paintedparts_call/MmCallMrp.cs     |  2 +-
 .../MES/mm/paintedparts_call/MmCallService.cs | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/DOAN.Model/MES/mm/paintedparts_call/MmCallMrp.cs b/DOAN.Model/MES/mm/paintedparts_call/MmCallMrp.cs
index 4c9a25c..d7516c7 100644
--- a/DOAN.Model/MES/mm/paintedparts_call/MmCallMrp.cs
+++ b/DOAN.Model/MES/mm/paintedparts_call/MmCallMrp.cs
@@ -23,7 +23,7 @@ public class MmCallMrp
     /// 工单时间 
     /// </summary>
     [SugarColumn(ColumnName = "workorder_date")]
-    public DateTime? WorkorderDate { get; set; }
+    public DateTime? WorkOrderDate { get; set; }
 
     /// <summary>
     /// 总成编号 
diff --git a/DOAN.Service/MES/mm/paintedparts_call/MmCallService.cs b/DOAN.Service/MES/mm/paintedparts_call/MmCallService.cs
index 679ad19..35b7347 100644
--- a/DOAN.Service/MES/mm/paintedparts_call/MmCallService.cs
+++ b/DOAN.Service/MES/mm/paintedparts_call/MmCallService.cs
@@ -34,8 +34,10 @@ namespace DOAN.Service.MES.mm.paintedparts_call
         {
             var predicate = Expressionable
                 .Create<MmCallMrp>()
-                .AndIF(!string.IsNullOrEmpty(parm.LineCode), it => it.LineCode == parm.LineCode)
-                .AndIF(parm.WorkOrderDate != null, it => it.WorkorderDate == parm.WorkOrderDate);
+                .AndIF(!string.IsNullOrEmpty(parm.LineCode) && !parm.LineCode.Contains("全部"), it => it.LineCode == parm.LineCode)
+                .AndIF(parm.WorkOrderDate != null, it => it.WorkOrderDate == parm.WorkOrderDate);
+
+
 
             var response = Queryable()
                 .Where(predicate.ToExpression())
@@ -54,7 +56,7 @@ namespace DOAN.Service.MES.mm.paintedparts_call
             var predicate = Expressionable
                 .Create<MmCallMrp>()
                 .AndIF(!string.IsNullOrEmpty(parm.LineCode), it => it.LineCode == parm.LineCode)
-                .AndIF(parm.WorkOrderDate != null, it => it.WorkorderDate == parm.WorkOrderDate)
+                .AndIF(parm.WorkOrderDate != null, it => it.WorkOrderDate == parm.WorkOrderDate)
                 .And(it => it.Quantity > 0);
             var response = Queryable()
                 .Where(predicate.ToExpression())
@@ -198,7 +200,8 @@ namespace DOAN.Service.MES.mm.paintedparts_call
                 // 查询指定产线工单及对应的 DeliveryNum
                 var workorders = Context
                     .Queryable<ProWorkorder>()
-                    .Where(x => x.LineCode == lineCode && x.WorkorderDate == checkDate)
+                    .WhereIF(!string.IsNullOrEmpty(parm.LineCode) && !parm.LineCode.Contains("全部"), it => it.LineCode == parm.LineCode)
+                    .Where(x => x.WorkorderDate == checkDate)
                     .Select(x => new { x.ProductionCode, x.DeliveryNum })
                     .ToList();
 
@@ -339,7 +342,7 @@ namespace DOAN.Service.MES.mm.paintedparts_call
                             {
                                 Id = SnowFlakeSingle.Instance.NextId().ToString(),
                                 LineCode = lineCode,
-                                WorkorderDate = checkDate,
+                                WorkOrderDate = parm.WorkOrderDate.Value,
                                 ProductionCode = item.ProductionCode,
                                 ProductionName = item.ProductionName,
                                 MaterialCode = item.MaterialCode,
@@ -367,7 +370,7 @@ namespace DOAN.Service.MES.mm.paintedparts_call
                 // 删除旧数据并插入新数据
                 Context
                     .Deleteable<MmCallMrp>()
-                    .Where(it => it.WorkorderDate == checkDate)
+                    .Where(it => it.WorkOrderDate == checkDate)
                     .Where(it => it.LineCode == lineCode)
                     .ExecuteCommand();
                 if (mmCallMrpList.Count == 0)
@@ -447,7 +450,7 @@ namespace DOAN.Service.MES.mm.paintedparts_call
                 {
                     Id = SnowFlakeSingle.Instance.NextId().ToString(),
                     LineCode = mmCallMrp.LineCode,
-                    WorkorderDate = mmCallMrp.WorkorderDate,
+                    WorkorderDate = mmCallMrp.WorkOrderDate,
                     CallTime = DateTime.Now,
                     ReceiveTime = null,
                     MaterialCode = mmCallMrp.MaterialCode,
@@ -492,7 +495,7 @@ namespace DOAN.Service.MES.mm.paintedparts_call
                     .Queryable<MmCallMrp>()
                     .Where(it =>
                         it.LineCode == mmCallReceive.LineCode
-                        && it.WorkorderDate == mmCallReceive.WorkorderDate
+                        && it.WorkOrderDate == mmCallReceive.WorkorderDate
                     )
                     .Where(it => it.MaterialCode == mmCallReceive.MaterialCode)
                     .First();