From 0f15f825cdd36540630e38e4f6343d636594af59 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Mon, 4 Mar 2024 18:17:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=87=87=E8=B4=AD=E6=96=B9?= =?UTF-8?q?=E6=A1=88-=E9=87=87=E8=B4=AD=E6=96=B9=E6=A1=88=E5=88=86?= =?UTF-8?q?=E9=85=8D=E8=AE=AE=E4=BB=B7=E7=BB=84=20=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=96=B9=E6=A1=88-=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=95=86=E4=B8=B4=E6=97=B6=E5=BD=92=E5=B1=9E=E8=AE=AE=E4=BB=B7?= =?UTF-8?q?=E7=BB=84=20=E7=BC=96=E8=BE=91=E9=87=87=E8=B4=AD=E6=96=B9?= =?UTF-8?q?=E6=A1=88-=E9=99=90=E5=88=B6=E5=90=8Csku=E5=90=8C=E8=AE=AE?= =?UTF-8?q?=E4=BB=B7=E7=BB=84=E7=9A=84=E6=96=B9=E6=A1=88=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=B8=8D=E8=B6=85=E8=BF=873=E4=B8=AA=20=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=96=B9=E6=A1=88-=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=A2=AB=E5=85=B6=E4=BB=96=E7=BB=84=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=9A=84=E9=87=87=E8=B4=AD=E5=95=86=20=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E9=87=87=E8=B4=AD,=E9=87=87=E8=B4=AD=E5=95=86?= =?UTF-8?q?=E6=B0=B8=E4=B9=85=E5=BD=92=E5=B1=9E=E4=BB=A5=E5=AE=B6=E6=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseOrder/PurchaseOrderBusiness.cs | 25 +++++++++------ .../PurchaseScheme/PurchaseSchemeBusiness.cs | 31 +++++++++++++++++-- 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 7c8cd19..d4cdf38 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -580,7 +580,7 @@ namespace BBWYB.Server.Business var dbSkuAndPurchaserRelationList = fsql.Select() .Where(spr => purchaserIdList.Contains(spr.PurchaserId) && spr.ShopId == request.ShopId) .ToList(); - + var dbPurchaserList = fsql.Select(purchaserIdList).ToList(); foreach (var purchaserId in purchaserIdList) { purchaserSkuDictionary.TryGetValue(purchaserId, out var fromRequestSkuList); @@ -601,10 +601,15 @@ namespace BBWYB.Server.Business SkuId = x })); } - //var update = fsql.Update(purchaserId) - // .Set(p => p.PurchasedCount + 1) - // .SetIf(newSkuRelationCount > 0, p => p.PurchasedSkuCount + newSkuRelationCount); - //updatePurchaserList.Add(update); + + #region 更新采购商归属 + var purchaser = dbPurchaserList.FirstOrDefault(p => p.Id == purchaserId); + if (purchaser != null && !string.IsNullOrEmpty(purchaser.BelongBargainTeamId) && purchaser.BelongType == Enums.PurchaserBelongType.临时) + { + var updatePurchaser = fsql.Update(purchaserId).Set(p => p.BelongType, Enums.PurchaserBelongType.永久); + updatePurchaserList.Add(updatePurchaser); + } + #endregion } } @@ -793,11 +798,11 @@ namespace BBWYB.Server.Business if (updateSkuOptimizationPurhcasementByIdList.Count() > 0) fsql.Update(updateSkuOptimizationPurhcasementByIdList).Set(s => s.IsPurchasementCompleted, true).ExecuteAffrows(); - //if (updatePurchaserList.Count() > 0) - //{ - // foreach (var update in updatePurchaserList) - // update.ExecuteAffrows(); - //} + if (updatePurchaserList.Count() > 0) + { + foreach (var update in updatePurchaserList) + update.ExecuteAffrows(); + } }); //#region 更新采购方案最新价格 diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs index 1bb343b..1a88368 100644 --- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs +++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs @@ -474,7 +474,12 @@ namespace BBWYB.Server.Business HYBDId = psReq.HYBDId, HYSchemeId = psReq.HYSchemeId, SchemeGroupId = psReq.SchemeGroupId ?? 0, - Version = 1 + Version = 1, + BelongBargainTeamId = uInfo.isBargainTeam ? uInfo.department.Id : string.Empty, + BelongBargainTeamName = uInfo.isBargainTeam ? uInfo.department.DepartmentName : string.Empty, + UpdateTeamId = uInfo.department.Id, + UpdateUserId = userId, + IsBargainTeamUpdate = uInfo.isBargainTeam }; addPurchaseSchemeList.Add(ps); foreach (var pspReq in psReq.PurchaseSchemeProductList) @@ -609,13 +614,21 @@ namespace BBWYB.Server.Business insertHistoryPSPList.Add(historyPsp); #endregion } + var belongBargainTeamId = uInfo.isBargainTeam ? uInfo.department.Id : string.Empty; + var belongBargainTeamName = uInfo.isBargainTeam ? uInfo.department.DepartmentName : string.Empty; + var psupdate = fsql.Update(schemeId) .Set(ps => ps.DefaultCost, defaultCost) .Set(ps => ps.BargainingCost, bargainingCost) .SetIf(bargainingCost != null && bargainingCost != dbps.BargainingCost, ps => ps.LastBargainingTime, DateTime.Now) .Set(ps => ps.HYSchemeId, psReq.HYSchemeId) .Set(ps => ps.HYBDId, psReq.HYBDId) - .Set(ps => ps.Version, newVersion); + .Set(ps => ps.Version, newVersion) + .Set(ps => ps.BelongBargainTeamId, belongBargainTeamId) + .Set(ps => ps.BelongBargainTeamName, belongBargainTeamName) + .Set(ps => ps.UpdateUserId, userId) + .Set(ps => ps.UpdateTeamId, uInfo.department.Id) + .Set(ps => ps.IsBargainTeamUpdate, uInfo.isBargainTeam); updatePurchaseSchemeList.Add(psupdate); #region 处理历史版本 @@ -641,6 +654,20 @@ namespace BBWYB.Server.Business purchaseProductSku.PurchaseRatio = 1; } + if (uInfo.isBargainTeam) + { + if (newPurchaserList.Count() > 0) + { + foreach (var p in newPurchaserList) + { + p.BelongBargainTeamId = uInfo.department.Id; + p.BelongBargainTeamName = uInfo.department.DepartmentName; + p.BelongType = Enums.PurchaserBelongType.临时; + } + } + } + + fsql.Transaction(() => { if (newPurchaserList.Count > 0)