From 19105666e734a7d1ec92606408a37ab7396d3153 Mon Sep 17 00:00:00 2001 From: liuwf Date: Thu, 29 May 2025 09:28:50 +0800 Subject: [PATCH] =?UTF-8?q?change-=E4=BC=98=E5=8C=96=E8=A1=A5=E7=A9=BA?= =?UTF-8?q?=E7=AE=B1=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SlnMesnac.WCS/WCS/CreateTaskByRecord.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/SlnMesnac.WCS/WCS/CreateTaskByRecord.cs b/SlnMesnac.WCS/WCS/CreateTaskByRecord.cs index c8753ed..d62870f 100644 --- a/SlnMesnac.WCS/WCS/CreateTaskByRecord.cs +++ b/SlnMesnac.WCS/WCS/CreateTaskByRecord.cs @@ -605,12 +605,18 @@ namespace SlnMesnac.WCS.WCS { try { + int totalTaskAmount = sqlSugarClient.Queryable().Count(); + int EmptyTaskAmount = sqlSugarClient.Queryable().Where(x => x.TaskType == StaticTaskType.SupplySmallPalletTask || x.TaskType == StaticTaskType.SupplySmallPalletFromTonerTask).Count(); //判断是否已经有空托盘补充任务 - bool hasTask = sqlSugarClient.Queryable().Any(x => x.TaskType == StaticTaskType.SupplySmallPalletTask || x.TaskType == StaticTaskType.SupplySmallPalletFromTonerTask); + bool hasTask = sqlSugarClient.Queryable().Any(x => (x.TaskType == StaticTaskType.SupplySmallPalletTask && x.TaskStatus < 5) || x.TaskType == StaticTaskType.SupplySmallPalletFromTonerTask); if (hasTask) { return; } + if (totalTaskAmount >= 3 || EmptyTaskAmount >= 2) + { + return; + } //判断色粉存放处是否有空托盘 WcsBaseEquip? emptyPalletEquip = sqlSugarClient.Queryable().InnerJoin( (wbe, wpi) => wbe.ContainerCode == wpi.PalletInfoCode && wpi.Amount == 0 && wbe.EquipStatus == 0)