From 12c38a51c7255808c503b9adbcaf86dc6c46acb8 Mon Sep 17 00:00:00 2001 From: bairubing Date: Wed, 15 Jan 2025 15:09:54 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E7=A0=94=E5=8F=91=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E7=94=B3=E8=AF=B7=E6=9C=8D=E5=8A=A1=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E6=8F=8F=E8=BF=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Vistar.Application/Entity/Obj119.cs | 1 + .../PurchasingRequisitionService.cs | 29 +++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Entity/Obj119.cs b/admin.net.pro/Admin.NET/Vistar.Application/Entity/Obj119.cs index ebe31a5..463fe7d 100644 --- a/admin.net.pro/Admin.NET/Vistar.Application/Entity/Obj119.cs +++ b/admin.net.pro/Admin.NET/Vistar.Application/Entity/Obj119.cs @@ -461,5 +461,6 @@ public class Obj119 /// [SugarColumn(ColumnName = "fld006416", ColumnDescription = "", Length = -1)] public string? fld006416 { get; set; } + public string? fld007052 { get; set; } } diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Service/PurchasingRequisition/PurchasingRequisitionService.cs b/admin.net.pro/Admin.NET/Vistar.Application/Service/PurchasingRequisition/PurchasingRequisitionService.cs index 3fb466a..e20b3b3 100644 --- a/admin.net.pro/Admin.NET/Vistar.Application/Service/PurchasingRequisition/PurchasingRequisitionService.cs +++ b/admin.net.pro/Admin.NET/Vistar.Application/Service/PurchasingRequisition/PurchasingRequisitionService.cs @@ -9,7 +9,10 @@ using Admin.NET.Core.Service; using Furion.DependencyInjection; using Furion.DynamicApiController; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; using NewLife.Xml; +using SqlSugar; using System; using System.Collections.Generic; using System.Linq; @@ -41,6 +44,7 @@ public class PurchasingRequisitionService : IDynamicApiController, ITransient public SqlSugarRepository _obj122Rep; public SqlSugarRepository _obj121Rep; public SqlSugarRepository _obj81Rep; + private readonly IServiceScopeFactory _scopeFactory; public PurchasingRequisitionService( SqlSugarRepository obj119Rep, @@ -53,7 +57,8 @@ public class PurchasingRequisitionService : IDynamicApiController, ITransient SqlSugarRepository obj122Rep, SqlSugarRepository obj121Rep, SqlSugarRepository obj109Rep, - SqlSugarRepository obj81Rep + SqlSugarRepository obj81Rep, + IServiceScopeFactory scopeFactory ) { @@ -68,6 +73,7 @@ public class PurchasingRequisitionService : IDynamicApiController, ITransient _obj121Rep = obj121Rep; _obj109Rep = obj109Rep; _obj81Rep = obj81Rep; + _scopeFactory = scopeFactory; } /// /// 创建研发采购申请 @@ -75,6 +81,9 @@ public class PurchasingRequisitionService : IDynamicApiController, ITransient /// public async Task> TimingSyncToSAPPurchasingRequisition() { + using var serviceScope = _scopeFactory.CreateScope(); + var db = serviceScope.ServiceProvider.GetRequiredService().AsTenant().GetConnectionScope("启威星 1.94.4.74").CopyNew(); + var sapOutputList = new List(); //获取Sap用户名 var sapUserName = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName); @@ -83,7 +92,7 @@ public class PurchasingRequisitionService : IDynamicApiController, ITransient var configid = 10; // 获取符合条件的采购申请单 - var PurchasingRequisitionList = await _obj119Rep.AsQueryable().Where(x => x.fld006416 == "A" && x.deleted == false && x.CheckedStatus == false && x._System_CurrentStage == "结束").ToListAsync(); + var PurchasingRequisitionList = await db.CopyNew().Queryable().Where(x => x.fld006416 == "A" && x.deleted == false && x.CheckedStatus == false && x._System_CurrentStage == "结束").ToListAsync(); foreach (var item in PurchasingRequisitionList) { @@ -110,8 +119,8 @@ public class PurchasingRequisitionService : IDynamicApiController, ITransient }; //查询BOM - var bomData = await _configurationDataRep.AsQueryable().Where(x => x.ConfigId == configid && x.ParentGuid == item.RecordGuid && x.isDeleted == false && x.ParentVersion == item.VersionIndex).ToListAsync(); - var project = await _obj109Rep.AsQueryable().Where(x => x.RecordGuid == item.fld004639_Rec && x.deleted == false).OrderByDescending(x => x.VersionIndex).FirstAsync(); + var bomData = await db.CopyNew().Queryable().Where(x => x.ConfigId == configid && x.ParentGuid == item.RecordGuid && x.isDeleted == false && x.ParentVersion == item.VersionIndex).ToListAsync(); + var project = await db.CopyNew().Queryable().Where(x => x.RecordGuid == item.fld004639_Rec && x.deleted == false).OrderByDescending(x => x.VersionIndex).FirstAsync(); foreach (var bomItem in bomData) { var unit = await _dataValidationService.GetUnit(bomItem.ChildObjID, bomItem.ChildGuid); @@ -133,7 +142,9 @@ public class PurchasingRequisitionService : IDynamicApiController, ITransient Ekorg = bomItem.fld006147, Zzpspnr = project._System_objNBS, Afnam = item.fld006125, - Loekz = bomItem.fld006141 + Loekz = bomItem.fld006141, + Ztext = item.fld007052 + }; itemList.Add(Item); } @@ -148,7 +159,7 @@ public class PurchasingRequisitionService : IDynamicApiController, ITransient } if (item.fld006139 == "I") { - await _obj119Rep.AsUpdateable() + db.CopyNew().Updateable() .SetColumns(it => new Obj119 { fld005934 = DateTime.Now,//同步日期 @@ -158,11 +169,11 @@ public class PurchasingRequisitionService : IDynamicApiController, ITransient fld006138 = sapOutput.banfn//采购申请编号 }) .Where(it => it.idRecord == item.idRecord) - .ExecuteCommandAsync(); + .ExecuteCommand(); } if (item.fld006139 == "U") { - await _obj119Rep.AsUpdateable() + db.CopyNew().Updateable() .SetColumns(it => new Obj119 { fld005934 = DateTime.Now,//同步日期 @@ -171,7 +182,7 @@ public class PurchasingRequisitionService : IDynamicApiController, ITransient fld005935 = msg//同步信息 }) .Where(it => it.idRecord == item.idRecord) - .ExecuteCommandAsync(); + .ExecuteCommand(); } var output = new SapOutput() {