From b57940ca4e28e3dd110111adac4b27d31f167f76 Mon Sep 17 00:00:00 2001 From: qian Date: Fri, 7 Feb 2025 10:54:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=B1=BB=E5=9E=8B=E7=89=A9?= =?UTF-8?q?=E6=96=99=20=E4=B8=8D=E5=85=81=E8=AE=B8=E8=B6=85=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SCP_ToleranceProportion_Controller.cs | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/Controller/SCP_ToleranceProportion_Controller.cs b/Controller/SCP_ToleranceProportion_Controller.cs index 0288896..39cc311 100644 --- a/Controller/SCP_ToleranceProportion_Controller.cs +++ b/Controller/SCP_ToleranceProportion_Controller.cs @@ -281,19 +281,9 @@ namespace CK.SCP.Controller { List ErrorList = new List(); var canQty = entity.AskQty - entity.ShippedQty - entity.ReduceQty; - // WS 和 WG 类型物料 填写的 发货数 不能大于 (要货数量-已发数量) - if (entity.DockCode == "WS" || entity.DockCode == "WG") - { - if (canQty > 0) - { - if (QtyAll > canQty) - { - ErrorList.Add(entity.PartCode + "发货数量>可发数量"); - } - } - } + // YC 和 WT 填写的 发货数 能大于 (要货数 - 已发数量) 但是 不能 大于容差范围 并且 要货数 - 已发数量 不能小于等于0 - else if (entity.DockCode == "YC" || entity.DockCode == "WT") + if (entity.DockCode == "YC" || entity.DockCode == "WT") { using (ScpEntities db = EntitiesFactory.CreateScpInstance()) { @@ -317,9 +307,16 @@ namespace CK.SCP.Controller } } } - else if ((canQty <= 0) && (QtyAll > 0)) + else if (canQty > 0) + { + if (QtyAll > canQty) + { + ErrorList.Add(entity.PartCode + "发货数量>可发数量"); + } + } + else if (canQty <= 0) { - ErrorList.Add(entity.PartCode + "只能超发一次哦"); + ErrorList.Add(entity.PartCode + "不能超发"); }