diff --git a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs
index 6a19976b..0216bf0f 100644
--- a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs
+++ b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs
@@ -53,6 +53,7 @@ namespace BLL
                               (string.IsNullOrEmpty(table.OutputMasterId) || x.OutputMasterId.Contains(table.OutputMasterId)) && 
                               (string.IsNullOrEmpty(table.ReqUnitId) || x.ReqUnitId.Contains(table.ReqUnitId)) &&
                               (string.IsNullOrEmpty(table.UnitWorkId) || x.WeldTaskId.Contains(table.UnitWorkId))&& 
+                              (string.IsNullOrEmpty(table.WeldTaskId) || x.WeldTaskId.Contains(table.WeldTaskId))&& 
                               (table.InOutType == null || x.InOutType == table.InOutType) &&
                               (table.TypeInt == null || x.TypeInt == table.TypeInt) &&
                               (table.Category == null || x.Category == table.Category) &&
@@ -130,7 +131,7 @@ namespace BLL
                        ReqUnitId = x.ReqUnitId,
                        ReqUnitName = x.ReqUnitName,
                        UnitWorkId = x.UnitWorkId,
-                       WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == Convert.ToDateTime(x.WeldTaskId.Split('|')[2].ToString()).Date)?.TaskCode : "" : "",
+                       WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == DateTime.ParseExact(x.WeldTaskId.Split('|')[2].ToString(), "yyyyMMdd", null).Date)?.TaskCode : "" : "",
                        CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
                        TypeString = TwConst.TypeIntMap.FirstOrDefault(y => y.Value == x.TypeInt).Key,
                        StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key,
@@ -178,7 +179,7 @@ namespace BLL
                        ReqUnitId = x.ReqUnitId,
                        ReqUnitName = x.ReqUnitName,
                        UnitWorkId = x.UnitWorkId,
-                       WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == Convert.ToDateTime(x.WeldTaskId.Split('|')[2].ToString()).Date)?.TaskCode : "" : "",
+                       WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == DateTime.ParseExact(x.WeldTaskId.Split('|')[2].ToString(), "yyyyMMdd", null).Date)?.TaskCode : "" : "",
                        CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
                        TypeString = TwConst.TypeIntMap.FirstOrDefault(y => y.Value == x.TypeInt).Key,
                        StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key,
diff --git a/SGGL/BLL/CLGL/TwOutputmasterService.cs b/SGGL/BLL/CLGL/TwOutputmasterService.cs
index ba035b9b..f93580b7 100644
--- a/SGGL/BLL/CLGL/TwOutputmasterService.cs
+++ b/SGGL/BLL/CLGL/TwOutputmasterService.cs
@@ -114,7 +114,7 @@ namespace BLL
                     StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key,
                     CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
                     WeldTaskId = x.WeldTaskId,
-                    WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == Convert.ToDateTime(x.WeldTaskId.Split('|')[2].ToString()).Date)?.TaskCode : "" : "",
+                    WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == DateTime.ParseExact(x.WeldTaskId.Split('|')[2].ToString(), "yyyyMMdd", null).Date)?.TaskCode : "" : "",
                     AuditMan = x.AuditMan,
                     AuditManName = x.AuditManName,
                     AuditDate = x.AuditDate,
@@ -155,7 +155,7 @@ namespace BLL
                     StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key,
                     CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
                     WeldTaskId = x.WeldTaskId,
-                    WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == Convert.ToDateTime(x.WeldTaskId.Split('|')[2].ToString()).Date)?.TaskCode : "" : "",
+                    WeldTaskCode = x.WeldTaskId != null ? x.WeldTaskId.Contains('|') ? Funs.DB.HJGL_WeldTask.FirstOrDefault(e => e.UnitWorkId == x.WeldTaskId.Split('|')[0].ToString() && e.UnitId == x.WeldTaskId.Split('|')[1].ToString() && e.TaskDate.Value.Date == DateTime.ParseExact(x.WeldTaskId.Split('|')[2].ToString(), "yyyyMMdd", null).Date)?.TaskCode : "" : "",
                     AuditMan = x.AuditMan,
                     AuditManName = x.AuditManName,
                     AuditDate = x.AuditDate,