提交代码

HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj

@@ -100,7 +100,7 @@
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="ThoughtWorks.QRCode">
-      <HintPath>..\..\..\..\ZHJA_HJGL\HJGL_ZH\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll</HintPath>
+      <HintPath>..\..\..\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Data.SqlClient;
 using System.Data;
 using BLL;
+using System.Linq;
 
 namespace FineUIPro.Web.HJGL.CheckManage
 {

HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs

@@ -248,7 +248,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             List<string> columns = new List<string>();
             if (c != null)
             {
-                 string[] items = c.Columns.Split(',');
+                string[] items = ("0," + c.Columns).Split(',');
                 columns = new List<string>(items);
             }
             else
@@ -289,7 +289,11 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             {
                 if (columns.Contains(column.ColumnIndex.ToString()))
                 {
-                    if (column.ColumnIndex == 1)
+                    if (column.ColumnIndex == 0)
+                    {
+                        sb.AppendFormat("<td align='center' style='width:118px;'>{0}</td>", column.HeaderText);
+                    }
+                    else if (column.ColumnIndex == 1)
                     {
                         sb.AppendFormat("<td align='center' style='width:118px;'>{0}</td>", column.HeaderText);
                     }
@@ -381,6 +385,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                 }
             }
             sb.Append("</tr>");
+            int a = 1;
             foreach (GridRow row in grid.Rows)
             {
                 sb.Append("<tr>");
@@ -390,6 +395,10 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                     if (columnIndexs.Contains(columnIndex))
                     {
                         string html = value.ToString();
+                        if (columnIndex == 0)
+                        {
+                            html = a.ToString();
+                        }
                         if (html.StartsWith(Grid.TEMPLATE_PLACEHOLDER_PREFIX))
                         {
                             // 模板列                            
@@ -421,6 +430,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                         sb.AppendFormat("<td align='center'>{0}</td>", html);
                     }
                     columnIndex++;
+                    a++;
                 }
                 sb.Append("</tr>");
             }

HJGL_ZH/FineUIPro.Web/Web.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <!--
   有关如何配置 ASP.NET 应用程序的详细消息，请访问
 
@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\sql2016;Database=HJGLDB_NEW;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200" />
+    <add key="ConnectionString" value="Server=.\sql2019;Database=HJGLDB_NEW;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="诺必达焊接管理系统"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -40,7 +40,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.0">
+    <compilation debug="false" targetFramework="4.0">
       <assemblies>
         <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
       </assemblies>