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; }
+ ///
+ /// 呆滞日期
+ ///
+
+ 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; }
+
+ ///
+ /// 呆滞日期
+ ///
+ [SugarColumn(ColumnName = "dull_date")]
+ public DateTime? DullDate { get; set; }
+
///
/// 检查日期
///
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().Where(it => it.CreatedTime>selecDate&&it.CreatedTime().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))
;