RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/doan-tech/zhuangpei-mesbackend

Browse Source
This commit is contained in:
赵正易 2024-11-13 16:48:10 +08:00
commit 2a8959f202
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DOAN.Model/MES/mm/Dto/MmSlowMoveMaterialDto.cs
View File

@ -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; }

7
DOAN.Model/MES/mm/MmSlowMoveMaterial.cs
View File

@ -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>

7
DOAN.Service/MES/mm/MmSlowMoveMaterialService.cs
View File

@ -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))
;