From 57f474a790d9fc4a3ff26180ea8903396b3e9714 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Wed, 17 Jan 2024 11:45:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E6=88=90=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssemblyCfgs/Dtos/AssemblyCfgErpDto.cs | 16 ++++++++++ .../AssemblyCfgs/Dtos/ExportErpAssemblyDto.cs | 15 ++++++++++ .../Dtos/QueryAssemblyCfgErpDto.cs | 11 ++++++- .../WY.NewJit.Application.Contracts.xml | 30 +++++++++++++++++++ .../AssemblyCfgs/AssemblyCfgErpAppService.cs | 20 +++++++++---- .../WY.NewJit.Application.xml | 8 ++--- 6 files changed, 89 insertions(+), 11 deletions(-) diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgErpDto.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgErpDto.cs index a066c3d..6887f7d 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgErpDto.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/AssemblyCfgErpDto.cs @@ -46,6 +46,22 @@ namespace WY.NewJit.MsgBaseData [ImporterHeader(Name = "长描述")] public virtual string GroupCode { get; set; } + + /// + /// 规格说明 + /// + [ExporterHeader(DisplayName = "规格说明")] + [ImporterHeader(Name = "规格说明")] + public virtual string SpecExplain { get; set; } + + + /// + /// 颜色说明 + /// + [ExporterHeader(DisplayName = "颜色说明")] + [ImporterHeader(Name = "颜色说明")] + public virtual string ColorExplain { get; set; } + /// /// 车型 /// diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/ExportErpAssemblyDto.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/ExportErpAssemblyDto.cs index 605acd6..84ac6ef 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/ExportErpAssemblyDto.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/ExportErpAssemblyDto.cs @@ -39,6 +39,21 @@ namespace WY.NewJit.MsgBaseData [ImporterHeader(Name = "ERP总成名称")] public string ErpAssemblyName { get; set; } + /// + /// 规格说明 + /// + [ExporterHeader(DisplayName = "规格说明")] + [ImporterHeader(Name = "规格说明")] + public string SpecExplain { get; set; } + + + /// + /// 颜色说明 + /// + [ExporterHeader(DisplayName = "颜色说明")] + [ImporterHeader(Name = "颜色说明")] + public string ColorExplain { get; set; } + /// /// 客户零件代码 /// diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/QueryAssemblyCfgErpDto.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/QueryAssemblyCfgErpDto.cs index d75015c..d802f15 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/QueryAssemblyCfgErpDto.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/QueryAssemblyCfgErpDto.cs @@ -18,12 +18,21 @@ namespace WY.NewJit.MsgBaseData /// 总成名称 /// public string ErpAssemblyName { get; set; } - /// /// 车型代码 /// public string VehicleModelCode { get; set; } + /// + /// 规格说明 + /// + public string SpecExplain { get; set; } + + /// + /// 颜色说明 + /// + public string ColorExplain { get; set; } + public DateTime? BeginCreateTime { get; set; } public DateTime? EndCreateTime { 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 3701d6c..40b2b93 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 @@ -1253,6 +1253,16 @@ 长描述 + + + 规格说明 + + + + + 颜色说明 + + 车型 @@ -1378,6 +1388,16 @@ ERP总成名称 + + + 规格说明 + + + + + 颜色说明 + + 客户零件代码 @@ -1438,6 +1458,16 @@ 车型代码 + + + 规格说明 + + + + + 颜色说明 + + 根据筛选条件获取分页实体列表 diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/AssemblyCfgs/AssemblyCfgErpAppService.cs b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/AssemblyCfgs/AssemblyCfgErpAppService.cs index 4dc9c26..4b46dcd 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/AssemblyCfgs/AssemblyCfgErpAppService.cs +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/MsgBaseData/AssemblyCfgs/AssemblyCfgErpAppService.cs @@ -157,7 +157,7 @@ SELECT top 1 v.Id ( select ROW_NUMBER() OVER(order by a.[CreationTime]) as row_number, a.Id, a.ErpAssemblyCode, a.ErpAssemblyName, a.ErpAssemblyVersion, - g.GroupCode, g.VehicleModel, g.IsDisable, g.CreationTime + g.GroupCode, g.VehicleModel, g.IsDisable, g.CreationTime ,g.SpecExplain,g.ColorExplain from FisAssemblyCfgErp a join FisAssemblyCfgGroup g on g.Id = a.GroupId where g.IsDeleted = 0 and g.IsDisable <> 1 {0} @@ -190,10 +190,10 @@ SELECT top 1 v.Id select ROW_NUMBER() OVER(order by a.[CreationTime]) as row_number, a.Id, g.GroupCode, a.ErpAssemblyCode, a.ErpAssemblyName, p.PartCode, pc.PartName, p.PartNum, - g.VehicleModel, g.IsDisable, g.CreationTime + g.VehicleModel, g.IsDisable, g.CreationTime,g.SpecExplain,g.ColorExplain from FisAssemblyCfgErp a join FisAssemblyCfgGroup g on g.Id = a.GroupId - join FisAssemblyCfgPart p on a.Id = p.AssemblyCfgErpId + left join FisAssemblyCfgPart p on a.Id = p.AssemblyCfgErpId left join FisPartCfg pc on p.PartCode = pc.PartCode where g.IsDeleted = 0 and g.IsDisable <> 1 {0} "; @@ -218,6 +218,14 @@ SELECT top 1 v.Id { where += string.Format(" and g.VehicleModel = '{0}'", input.VehicleModelCode); } + if (!string.IsNullOrEmpty(input.SpecExplain)) + { + where += string.Format(" and g.SpecExplain = '{0}'", input.SpecExplain); + } + if (!string.IsNullOrEmpty(input.ColorExplain)) + { + where += string.Format(" and g.ColorExplain = '{0}'", input.ColorExplain); + } if (input.BeginCreateTime != null) { where += string.Format(" and g.CreationTime >= '{0}'", ((DateTime)input.BeginCreateTime).ToString("yyyy-MM-dd HH:mm:ss")); @@ -677,10 +685,10 @@ SELECT top 1 v.Id /// - /// 导入 + /// 总成组导入 /// - /// 导入文件 - /// 执行成功返回真 + /// + /// [HttpPost] [Route("import-erp-assembly-group")] [DisableRequestSizeLimit] diff --git a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml index cfd2423..492904d 100644 --- a/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml +++ b/src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml @@ -130,7 +130,7 @@ 校验出错时，是否强制执行 执行成功返回真 - + 打印时间提醒 @@ -409,10 +409,10 @@ - 导入 + 总成组导入 - 导入文件 - 执行成功返回真 + +