diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/AlreadyPrintDto.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/AlreadyPrintDto.cs index 068000b..03cd577 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/AlreadyPrintDto.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/AlreadyPrintDto.cs @@ -139,6 +139,19 @@ namespace WY.NewJit.PrintTable [ImporterHeader(Name = "最后修改人")] public Guid? LastModifierId { get; set; } + /// + /// 规格说明:HSC0DRCC0001 + /// + [ExporterHeader(DisplayName = "规格说明")] + [ImporterHeader(Name = "规格说明")] + public virtual string SpecExplain { get; set; } + + /// + /// 颜色说明:车型描述后7位,石墨黑/云杉灰 + /// + [ExporterHeader(DisplayName = "颜色说明")] + [ImporterHeader(Name = "颜色说明")] + public virtual string ColorExplain { get; set; } } } diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml index b7f7c4a..5038af0 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml @@ -4265,6 +4265,16 @@ 最后修改人 + + + 规格说明:HSC0DRCC0001 + + + + + 颜色说明:车型描述后7位,石墨黑/云杉灰 + + 业务类型:1 门板 2 其它柱护板 3 柱护板 diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportRecordAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportRecordAppService.cs index 1af9f3f..2b49774 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportRecordAppService.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportRecordAppService.cs @@ -429,6 +429,8 @@ namespace WY.NewJit.EdiReceive /// 校验出错时,是否强制执行 /// 执行成功返回真 [UnitOfWork(IsDisabled =true)] + //[UnitOfWork(isTransactional: false)] //[UnitOfWork(false)] + //[UnitOfWork] [HttpPost] [Route("import")] [DisableRequestSizeLimit] @@ -470,7 +472,7 @@ namespace WY.NewJit.EdiReceive return ret; } - using (var uow = _unitOfWorkManager.Begin()) + using (var uow = _unitOfWorkManager.Begin(requiresNew:true)) { var srcLst = impResult.Data.AsEnumerable().ToList(); var tarLst = ObjectMapper.Map, List>(srcLst); diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/EdiReceive/Services/EdiParseDomainService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/EdiReceive/Services/EdiParseDomainService.cs index 0f530be..2812b39 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/EdiReceive/Services/EdiParseDomainService.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/EdiReceive/Services/EdiParseDomainService.cs @@ -155,7 +155,7 @@ namespace WY.NewJit.EdiReceive.Services /// /// 导入Excel内容 /// 校验不通过时,是否强制执行通过 - public async Task ParseEdi(List input, bool forceExecute = false) + public virtual async Task ParseEdi(List input, bool forceExecute = false) { ObjectResultDto ret = new ObjectResultDto(); @@ -256,7 +256,7 @@ namespace WY.NewJit.EdiReceive.Services var succObj1 = await _hqM100DomainServie.InsertM100(m100Obj, true); //不匹配时,插入未知总成 - var succObj2 = await InsertUnknownAssembly(m100Obj); + var succObj2 = await InsertUnknownAssembly(m100Obj, true); _logger.LogDebug(_errorMessagePrefix + $"未匹配总成,插入未知总成完成:{orderItem.HostSN}"); ret.Status = (succObj1 != null && succObj2 != null); } @@ -287,7 +287,7 @@ namespace WY.NewJit.EdiReceive.Services /// /// /// - public async Task> ReParsing(BillM100 m100Obj, string specExplain, string colorExplain) + public virtual async Task> ReParsing(BillM100 m100Obj, string specExplain, string colorExplain) { ObjectResultDto ret = new ObjectResultDto(); Group_Assembly groupAssemblyObj = HQ_CacheManagerDomainService._groupAssemblyList.FirstOrDefault(itm => itm.SpecExplain == specExplain && itm.ColorExplain == colorExplain); @@ -514,7 +514,7 @@ namespace WY.NewJit.EdiReceive.Services /// 不匹配时,插入未知总成,写提醒日志 /// /// - private async Task InsertUnknownAssembly(BillM100 bill) + private async Task InsertUnknownAssembly(BillM100 bill, bool autoSave = false) { UnknownAssembly ret = null; try @@ -530,7 +530,7 @@ namespace WY.NewJit.EdiReceive.Services //} //var partNumSum = unknownAssemblyObj.UnknownAssemblyParts.Sum(itm => (int)itm.PartNum); //unknownAssemblyObj.SetPartNum(partNumSum); - ret = await _unknownAssemblyRepository.InsertAsync(unknownAssemblyObj); + ret = await _unknownAssemblyRepository.InsertAsync(unknownAssemblyObj, autoSave); return ret; } catch (Exception ex) diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/AlreadyPrint.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/AlreadyPrint.cs index b6c00f4..9de71a9 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/AlreadyPrint.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/AlreadyPrint.cs @@ -121,6 +121,18 @@ namespace WY.NewJit.PrintTable this.Id = id; } + /// + /// 规格说明:HSC0DRCC0001 + /// + public virtual string SpecExplain { get; set; } + + /// + /// 颜色说明:车型描述后7位,石墨黑/云杉灰 + /// + public virtual string ColorExplain { get; set; } + + + } } diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/appsettings.json b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/appsettings.json index 025a999..bc6bcdd 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/appsettings.json +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/appsettings.json @@ -12,10 +12,10 @@ //"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;" "Default": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;", - //"NewJitPG": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_HQ;uid=sa;pwd=ChangkeTec@2021;", - //"WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;" - "NewJitPG": "Server=192.168.0.68;Database=NewJitPG_HQ;uid=sa;pwd=Microsoft@2022;", - "WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;" + "NewJitPG": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_HQ;uid=sa;pwd=ChangkeTec@2021;", + "WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;" + //"NewJitPG": "Server=192.168.0.68;Database=NewJitPG_HQ;uid=sa;pwd=Microsoft@2022;", + //"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;" }, "AuthServer": { "Authority": "http://dev.ccwin-in.com:16077",