From a5d70cac294f536718c56a9106cfffe13a7a3716 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Wed, 13 Nov 2024 14:55:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=86=E6=BB=9E=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs   | 6 ++++++
 DOAN.Model/MES/mm/MmSlowMoveMaterial.cs          | 7 +++++++
 DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs | 7 ++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs b/DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs
index d430106..61844b8 100644
--- a/DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs
+++ b/DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs
@@ -25,6 +25,12 @@ namespace DOAN.Model.MES.mm.Dto
 
         public string LineCode { get; set; }
 
+        /// <summary>
+        /// 呆滞日期
+        /// </summary>
+     
+        public DateTime? DullDate { get; set; }
+
         public DateTime? CheckDate { get; set; }
 
         public string MaterialCode { get; set; }
diff --git a/DOAN.Model/MES/mm/MmSlowMoveMaterial.cs b/DOAN.Model/MES/mm/MmSlowMoveMaterial.cs
index dd6f9e1..0c20ef4 100644
--- a/DOAN.Model/MES/mm/MmSlowMoveMaterial.cs
+++ b/DOAN.Model/MES/mm/MmSlowMoveMaterial.cs
@@ -19,6 +19,13 @@ namespace DOAN.Model.MES.mm
         [SugarColumn(ColumnName = "line_code")]
         public string LineCode { get; set; }
 
+
+        /// <summary>
+        /// 呆滞日期
+        /// </summary>
+        [SugarColumn(ColumnName = "dull_date")]
+        public DateTime? DullDate { get; set; }
+
         /// <summary>
         /// 检查日期 
         /// </summary>
diff --git a/DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs b/DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs
index 9fbc746..0fd2c6f 100644
--- a/DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs
+++ b/DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs
@@ -66,6 +66,7 @@ namespace DOAN.Service.MES.mm
              MmSlowMoveMaterial mmSlowMoveMaterial = new MmSlowMoveMaterial();
              mmSlowMoveMaterial.Id = XueHua;
              //mmSlowMoveMaterial.CheckDate = selecDate;
+             mmSlowMoveMaterial.DullDate = selecDate;
              mmSlowMoveMaterial.LineCode = logicConsumeMaterial[i].LineCode;
              mmSlowMoveMaterial.MaterialCode = logicConsumeMaterial[i].MaterialCode;
              mmSlowMoveMaterial.MaterialName = logicConsumeMaterial[i].MaterialName;
@@ -83,7 +84,7 @@ namespace DOAN.Service.MES.mm
                      if (WarehouseSendMaterial[j].MaterialCode == logicConsumeMaterial[i].MaterialCode)
                      {
                          mmSlowMoveMaterial.WarehouseDeliveryConsume = WarehouseSendMaterial[j].Quantity;
-                         mmSlowMoveMaterial.LogicQuantity=  WarehouseSendMaterial[j].Quantity - logicConsumeMaterial[j].Quantity;
+                         mmSlowMoveMaterial.LogicQuantity=  WarehouseSendMaterial[j].Quantity - logicConsumeMaterial[i].Quantity;
                      }
                  }
              }
@@ -99,7 +100,7 @@ namespace DOAN.Service.MES.mm
          {
              UseTran2(() =>
              {
-                 Context.Deleteable<MmSlowMoveMaterial>().Where(it => it.CreatedTime>selecDate&&it.CreatedTime<selecDate.AddDays(1)).ExecuteCommand();
+                 Context.Deleteable<MmSlowMoveMaterial>().Where(it => it.DullDate==selecDate).ExecuteCommand();
                  result = Context.Insertable(list).ExecuteCommand();
 
              });
@@ -126,7 +127,7 @@ namespace DOAN.Service.MES.mm
                     .AndIF(parm.CheckDateArray[0]>DateTime.MinValue,it=>it.CreatedTime>=parm.CheckDateArray[0])
                     .AndIF(parm.CheckDateArray[1]>DateTime.MinValue,it=>it.CreatedTime<=parm.CheckDateArray[1].AddDays(1))
                     .AndIF(!string.IsNullOrEmpty(parm.MaterialCode),it=>it.MaterialCode.Contains(parm.MaterialCode))
-                    .AndIF(!string.IsNullOrEmpty(parm.LineCode),it=>it.LineCode.Contains(parm.LineCode))
+                    .AndIF(!string.IsNullOrEmpty(parm.LineCode),it=>it.LineCode==parm.LineCode)
                     .AndIF(!string.IsNullOrEmpty(parm.MaterialName),it=>it.MaterialName.Contains(parm.MaterialName))
                 
                 ;