提交代码

HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx

@@ -61,6 +61,12 @@
                             <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                         </ItemTemplate>
                     </f:TemplateField>
+                    <f:RenderField Width="150px" ColumnID="InPutDate" DataField="InPutDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss"
+                        HeaderText="录入时间" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="170px" ColumnID="OrderTime" DataField="OrderTime"
+                        FieldType="String" HeaderText="预约时间" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
                     <f:RenderField Width="150px" ColumnID="UsingDate" DataField="UsingDate" FieldType="String"
                          HeaderText="领用时间" HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>

HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs

@@ -37,6 +37,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
             string strSql = @"SELECT UsingMat.UsingMatId, UsingMat.ProjectId, UsingMat.UsePosition, 
                                      UsingMat.WeldId,UsingMat.UsingPlanId,ISNULL(UsingMat.Amount,0) AS Amount, 
                                      ISNULL(UsingMat.TwoAmount,0) AS TwoAmount,UsingMat.UsingMan, UsingMat.UsingDate,
+                                     CONVERT(varchar(100), UsingPlan.OrderDate, 23)+' '+UsingPlan.OrderTime as OrderTime,
 									 (CASE WHEN stockIn.Warrantybook IS NOT NULL THEN stockIn.Warrantybook
 									      ELSE UsingMat.Warrantybook END) AS Warrantybook,UsingPlan.STE_Name,
                                      UsingMat.Number,Project.ProjectCode,Project.ProjectName,WeldInfo.WeldCode,
@@ -340,7 +341,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
             BindGrid();
             foreach (GridColumn column in grid.Columns)
             {
-                if (column.ColumnIndex < 18)
+                if (column.ColumnIndex < 20)
                 {
                     sb.AppendFormat("<td>{0}</td>", column.HeaderText);
                 }
@@ -352,7 +353,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                 sb.Append("<tr>");
                 foreach (GridColumn column in grid.Columns)
                 {
-                    if (column.ColumnIndex < 18)
+                    if (column.ColumnIndex < 20)
                     {
                         string html = row.Values[column.ColumnIndex].ToString();
                         if (column.ColumnID == "tfNumber")