diff --git a/HJGL_ZH/BLL/BLL.csproj b/HJGL_ZH/BLL/BLL.csproj
index a4b332c..839ae5a 100644
--- a/HJGL_ZH/BLL/BLL.csproj
+++ b/HJGL_ZH/BLL/BLL.csproj
@@ -57,7 +57,7 @@
..\Lib\Microsoft.SQLServer.ManagedDTS.dll
- ..\packages\Newtonsoft.Json.13.0.1\lib\net40\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll
..\packages\NPOI.2.5.1\lib\net40\NPOI.dll
diff --git a/HJGL_ZH/BLL/packages.config b/HJGL_ZH/BLL/packages.config
index 592d572..b69a943 100644
--- a/HJGL_ZH/BLL/packages.config
+++ b/HJGL_ZH/BLL/packages.config
@@ -1,6 +1,6 @@
-
+
diff --git a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
index b3e2a64..bee9d4f 100644
--- a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
@@ -62,9 +62,8 @@
-
- False
- ..\FineUIPro\Net40\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll
..\packages\NPOI.2.5.1\lib\net40\NPOI.dll
diff --git a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
index ac1e608..8ba20cd 100644
--- a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
ProjectFiles
- Release|Any CPU
+ Debug|Any CPU
true
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx
index c5d14dd..16a29e3 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx
@@ -48,8 +48,11 @@
-
+
+
+
+
+
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs
index 7262fde..07be7cd 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs
@@ -256,8 +256,12 @@ namespace FineUIPro.Web.HJGL.WeldingReport
for (int i=1; i <= Grid1.Columns.Count; i++)
{
columns.Add(i.ToString());
- }
+ }
}
+ if (!columns.Contains("0"))
+ {
+ columns.Add("0");
+ }
Response.ClearContent();
string filename = Funs.GetNewFileName();
//string style = @"