From f4157f8afcffd584c8b74fc3e55747f740a27c99 Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Mon, 28 Aug 2023 16:29:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseScheme/PurchaseSchemeBusiness.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs index 6a15dcb..6231c81 100644 --- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs +++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs @@ -82,7 +82,7 @@ namespace BBWYB.Server.Business List deletePurchaseSchemeIdList = new List(); List> updatePurchaseSchemeList = new List>(); - if (batchCURDSchemeRequest.AddPurchaseSchemeList.Count > 0) + if (batchCURDSchemeRequest.AddPurchaseSchemeList != null && batchCURDSchemeRequest.AddPurchaseSchemeList.Count > 0) { ExtractNewPurchaser(batchCURDSchemeRequest.AddPurchaseSchemeList, newPurchaserList); @@ -119,7 +119,7 @@ namespace BBWYB.Server.Business } #region 更新采购方案 - if (batchCURDSchemeRequest.EditPurchaseSchemeList.Count > 0) + if (batchCURDSchemeRequest.EditPurchaseSchemeList != null && batchCURDSchemeRequest.EditPurchaseSchemeList.Count > 0) { deletePurchaseSchemeIdList.AddRange(batchCURDSchemeRequest.EditPurchaseSchemeList.Select(ps => ps.Id)); foreach (var psReq in batchCURDSchemeRequest.EditPurchaseSchemeList) @@ -225,9 +225,11 @@ namespace BBWYB.Server.Business throw new BusinessException("更新方案缺少ProductId/SkuId"); } + if (batchCURDSchemeRequest.EditPurchaseSchemeList.Any(ps => ps.PurchaseSchemeProductList.Any(pp => string.IsNullOrEmpty(pp.PurchaserId) || + string.IsNullOrEmpty(pp.PurchaserId2) || string.IsNullOrEmpty(pp.PurchaserName)))) - throw new BusinessException("更新方案中有采购商Id/Name/Location为空"); + throw new BusinessException("更新方案中有采购商Id/Id2/Name/Location为空"); if (batchCURDSchemeRequest.EditPurchaseSchemeList.Any(ps => ps.Id == 0)) throw new BusinessException("更新方案中采购方案缺少Id"); @@ -249,8 +251,9 @@ namespace BBWYB.Server.Business } if (batchCURDSchemeRequest.AddPurchaseSchemeList.Any(ps => ps.PurchaseSchemeProductList.Any(pp => string.IsNullOrEmpty(pp.PurchaserId) || + string.IsNullOrEmpty(pp.PurchaserId2) || string.IsNullOrEmpty(pp.PurchaserName)))) - throw new BusinessException("新增方案中有采购商Id/Name/Location为空"); + throw new BusinessException("新增方案中有采购商Id/Id2/Name/Location为空"); var productIds = batchCURDSchemeRequest.AddPurchaseSchemeList.Select(ps => ps.ProductId).ToList(); @@ -285,7 +288,7 @@ namespace BBWYB.Server.Business List> updatePurchaseSchemeList = new List>(); List insertPurchaseSchemeGroupsList = new List(); - if (batchCURDSchemeRequest.AddPurchaseSchemeList.Count > 0) + if (batchCURDSchemeRequest.AddPurchaseSchemeList != null && batchCURDSchemeRequest.AddPurchaseSchemeList.Count > 0) { ExtractNewPurchaser(batchCURDSchemeRequest.AddPurchaseSchemeList, newPurchaserList); @@ -340,7 +343,7 @@ namespace BBWYB.Server.Business } #region 更新采购方案 - if (batchCURDSchemeRequest.EditPurchaseSchemeList.Count > 0) + if (batchCURDSchemeRequest.EditPurchaseSchemeList != null && batchCURDSchemeRequest.EditPurchaseSchemeList.Count > 0) { deletePurchaseSchemeIdList.AddRange(batchCURDSchemeRequest.EditPurchaseSchemeList.Select(ps => ps.Id)); foreach (var psReq in batchCURDSchemeRequest.EditPurchaseSchemeList)