diff --git a/SGGL/BLL/CLGL/TwOutputmasterService.cs b/SGGL/BLL/CLGL/TwOutputmasterService.cs index 1dc3177e..cc3fa475 100644 --- a/SGGL/BLL/CLGL/TwOutputmasterService.cs +++ b/SGGL/BLL/CLGL/TwOutputmasterService.cs @@ -130,7 +130,8 @@ namespace BLL AuditDate2 = x.AuditDate2, WarehouseMan = x.WarehouseMan, WarehouseManName = x.WarehouseManName, - WarehouseDate = x.WarehouseDate + WarehouseDate = x.WarehouseDate, + Remark=x.Remark }; } diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 52e87e5f..b3d0f6e1 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -17033,7 +17033,7 @@ - + diff --git a/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs b/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs index b1cb0d7d..48187c30 100644 --- a/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs +++ b/SGGL/Model/CLGL/Tw_InOutMasterOutput.cs @@ -18,8 +18,7 @@ namespace Model public string AuditManName2 { get; set; } public string ReqUnitName { get; set; } public string UnitWorkId { get; set; } - public string WeldTaskCode { get; set; } - public string Remark { get; set; } + public string WeldTaskCode { get; set; } public int? PipeLineSortIndex { get; set; } }