总成查询修改添加字段

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; }
 
+
+        /// <summary>
+        /// 规格说明
+        /// </summary>
+        [ExporterHeader(DisplayName = "规格说明")]
+        [ImporterHeader(Name = "规格说明")]
+        public virtual string SpecExplain { get; set; }
+
+
+        /// <summary>
+        /// 颜色说明
+        /// </summary>
+        [ExporterHeader(DisplayName = "颜色说明")]
+        [ImporterHeader(Name = "颜色说明")]
+        public virtual string ColorExplain { get; set; }
+
         /// <summary>
         /// 车型
         /// </summary>

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; }
 
+        /// <summary>
+        /// 规格说明
+        /// </summary>
+        [ExporterHeader(DisplayName = "规格说明")]
+        [ImporterHeader(Name = "规格说明")]
+        public string SpecExplain { get; set; }
+
+
+        /// <summary>
+        /// 颜色说明
+        /// </summary>
+        [ExporterHeader(DisplayName = "颜色说明")]
+        [ImporterHeader(Name = "颜色说明")]
+        public string ColorExplain { get; set; }
+
         /// <summary>
         /// 客户零件代码
         /// </summary>

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/MsgBaseData/AssemblyCfgs/Dtos/QueryAssemblyCfgErpDto.cs

@@ -18,12 +18,21 @@ namespace WY.NewJit.MsgBaseData
         /// 总成名称
         /// </summary>
         public string ErpAssemblyName { get; set; }
-
         /// <summary>
         /// 车型代码
         /// </summary>
         public string VehicleModelCode { get; set; }
 
+        /// <summary>
+        /// 规格说明
+        /// </summary>
+        public string SpecExplain { get; set; }
+
+        /// <summary>
+        /// 颜色说明
+        /// </summary>
+        public string ColorExplain { get; set; }
+
         public DateTime? BeginCreateTime { get; set; }
 
         public DateTime? EndCreateTime { get; set; }

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml

@@ -1253,6 +1253,16 @@
             长描述
             </summary>
         </member>
+        <member name="P:WY.NewJit.MsgBaseData.AssemblyCfgErpDto.SpecExplain">
+            <summary>
+            规格说明
+            </summary>
+        </member>
+        <member name="P:WY.NewJit.MsgBaseData.AssemblyCfgErpDto.ColorExplain">
+            <summary>
+            颜色说明
+            </summary>
+        </member>
         <member name="P:WY.NewJit.MsgBaseData.AssemblyCfgErpDto.VehicleModel">
             <summary>
             车型
@@ -1378,6 +1388,16 @@
             ERP总成名称
             </summary>
         </member>
+        <member name="P:WY.NewJit.MsgBaseData.ExportErpAssemblyDto.SpecExplain">
+            <summary>
+            规格说明
+            </summary>
+        </member>
+        <member name="P:WY.NewJit.MsgBaseData.ExportErpAssemblyDto.ColorExplain">
+            <summary>
+            颜色说明
+            </summary>
+        </member>
         <member name="P:WY.NewJit.MsgBaseData.ExportErpAssemblyDto.PartCode">
             <summary>
             客户零件代码
@@ -1438,6 +1458,16 @@
             车型代码
             </summary>
         </member>
+        <member name="P:WY.NewJit.MsgBaseData.QueryAssemblyCfgErpDto.SpecExplain">
+            <summary>
+            规格说明
+            </summary>
+        </member>
+        <member name="P:WY.NewJit.MsgBaseData.QueryAssemblyCfgErpDto.ColorExplain">
+            <summary>
+            颜色说明
+            </summary>
+        </member>
         <member name="M:WY.NewJit.MsgBaseData.IAssemblyCfgErpAppService.GetErpAssemblyListAsync(WY.NewJit.MsgBaseData.QueryAssemblyCfgErpDto)">
             <summary>
             根据筛选条件获取分页实体列表

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
 
 
         /// <summary>
-        /// 导入
+        /// 总成组导入
         /// </summary>
-        /// <param name="files">导入文件</param>
-        /// <returns>执行成功返回真</returns>
+        /// <param name="files"></param>
+        /// <returns></returns>
         [HttpPost]
         [Route("import-erp-assembly-group")]
         [DisableRequestSizeLimit]

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/WY.NewJit.Application.xml

@@ -130,7 +130,7 @@
             <param name="forceExecute">校验出错时，是否强制执行</param>
             <returns>执行成功返回真</returns>
         </member>
-        <member name="M:WY.NewJit.EdiReceive.ImportRecordAppService.PrintTimeoutRemind(WY.NewJit.MsgCheck.TimeOutRemindInputDto)">
+        <member name="M:WY.NewJit.EdiReceive.ImportRecordAppService.PrintTimeoutRemind">
             <summary>
             打印时间提醒
             </summary>
@@ -409,10 +409,10 @@
         </member>
         <member name="M:WY.NewJit.MsgBaseData.AssemblyCfgErpAppService.ImportErpAssemblyGroupAsync(Microsoft.AspNetCore.Http.IFormFileCollection)">
             <summary>
-            导入
+            总成组导入
             </summary>
-            <param name="files">导入文件</param>
-            <returns>执行成功返回真</returns>
+            <param name="files"></param>
+            <returns></returns>
         </member>
         <member name="M:WY.NewJit.MsgBaseData.AssemblyCfgErpAppService.RemoveRepeatErpAssembly(System.Int32)">
             <summary>