111

HJGL_ZH/BLL/BLL.csproj

@@ -57,7 +57,7 @@
       <HintPath>..\Lib\Microsoft.SQLServer.ManagedDTS.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NPOI, Version=2.5.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
       <HintPath>..\packages\NPOI.2.5.1\lib\net40\NPOI.dll</HintPath>

HJGL_ZH/BLL/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net40" />
   <package id="NPOI" version="2.5.1" targetFramework="net40" />
   <package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net40" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />

HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj

@@ -62,9 +62,8 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.JScript" />
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
-      <HintPath>..\FineUIPro\Net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NPOI, Version=2.5.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
       <HintPath>..\packages\NPOI.2.5.1\lib\net40\NPOI.dll</HintPath>

HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ProjectFiles</ProjectView>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

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

@@ -48,8 +48,11 @@
                     </f:Toolbar>
                 </Toolbars>
                 <Columns>
-                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                    <f:TemplateField ColumnID="tfNumber" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center">
-                        TextAlign="Center" />
+                        <ItemTemplate>
+                            <asp:Label ID="labNumber" runat="server" Text=' <%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1%>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>
                     <f:TemplateField ColumnID="tfProjectCode" HeaderText="施工号" Width="100px" HeaderTextAlign="Center"
                         TextAlign="Center">
                         <ItemTemplate>

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

@@ -258,6 +258,10 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                      columns.Add(i.ToString());
                  }  
              }
+            if (!columns.Contains("0"))
+            {
+                columns.Add("0");
+            }
             Response.ClearContent();
             string filename = Funs.GetNewFileName();
             //string style = @"<style> .text { mso-number-format:\@; } </script> ";
@@ -289,6 +293,10 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             {
                 if (columns.Contains(column.ColumnIndex.ToString()))
                 {
+                    if (column.ColumnIndex == 0)
+                    {
+                        sb.AppendFormat("<td align='center' style='width:45px;'>{0}</td>", column.HeaderText);
+                    }
                     if (column.ColumnIndex == 1)
                     {
                         sb.AppendFormat("<td align='center' style='width:118px;'>{0}</td>", column.HeaderText);

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

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.WeldingReport {
+namespace FineUIPro.Web.HJGL.WeldingReport
+{
 
 
-    public partial class InspectionBatchItem {
+    public partial class InspectionBatchItem
+    {
 
         /// <summary>
         /// form1 控件。
@@ -129,6 +131,15 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill2;
 
+        /// <summary>
+        /// labNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label labNumber;
+
         /// <summary>
         /// lblProjectCode 控件。
         /// </summary>

HJGL_ZH/FineUIPro.Web/Web.config

@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino" />
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\MSSQLSERVER2016;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=.\sql2016;Database=HJGLDB_ZH;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/;" />

HJGL_ZH/FineUIPro.Web/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net40" />
   <package id="NPOI" version="2.5.1" targetFramework="net40" />
   <package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net40" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />

HJGL_ZH/Model/Model.csproj

@@ -39,6 +39,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Linq" />

HJGL_ZH/Model/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net40" />
 </packages>

HJGL_ZH/WebAPI/Web.config

@@ -46,7 +46,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />

HJGL_ZH/WebAPI/WebAPI.csproj

@@ -47,6 +47,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -67,9 +70,6 @@
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net.Http">
     </Reference>
     <Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

HJGL_ZH/WebAPI/WebAPI.csproj.user

@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>

HJGL_ZH/WebAPI/packages.config

@@ -22,6 +22,6 @@
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net461" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
   <package id="Modernizr" version="2.8.3" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="WebGrease" version="1.6.0" targetFramework="net461" />
 </packages>