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

MRP物料第二版

Browse Source
This commit is contained in:
杨晓东 2025-09-26 15:11:14 +08:00
parent 520f321b95
commit aa2b0501a5
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOAN.Model/MES/mm/paintedparts_call/MmCallMrp.cs
View File

@ -23,7 +23,7 @@ public class MmCallMrp
/// 工单时间
/// </summary>
[SugarColumn(ColumnName = "workorder_date")]
public DateTime? WorkorderDate { get; set; }
public DateTime? WorkOrderDate { get; set; }
/// <summary>
/// 总成编号

19
DOAN.Service/MES/mm/paintedparts_call/MmCallService.cs
View File

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