From d21b70cade8ba5aa2a8020da09fa5ac53be904b2 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 12 Sep 2024 15:17:43 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 1 +
.../FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +-
HJGL_ZH/WebAPI/WebAPI.csproj.user | 28 ++-----------------
3 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/.gitignore b/.gitignore
index 84a96d7..d9a1718 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,4 @@ HJGL_ZH/BLL/bin/Release/NPOI.OpenXmlFormats.dll
/HJGL_ZH/Model/obj/Release/Model.dll
/HJGL_ZH/Model/obj/Release/Model.pdb
/HJGL_ZH/WebAPI/Web.config
+/ReleasePackerALL2017.bat
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/WebAPI/WebAPI.csproj.user b/HJGL_ZH/WebAPI/WebAPI.csproj.user
index 643f3e5..9100e6a 100644
--- a/HJGL_ZH/WebAPI/WebAPI.csproj.user
+++ b/HJGL_ZH/WebAPI/WebAPI.csproj.user
@@ -8,31 +8,7 @@
- Release|Any CPU
+ Debug|Any CPU
-
-
-
-
-
-
- CurrentPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- True
- True
-
-
-
-
+
\ No newline at end of file
From f0bb5eacc2619eec07f5a99c317156a33b410d5e Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 9 Oct 2024 19:25:24 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Model.csproj.CoreCompileInputs.cache | 2 +-
.../Debug/Model.csprojAssemblyReference.cache | Bin 2063 -> 9919 bytes
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/HJGL_ZH/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache b/HJGL_ZH/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
index 8e1bb6c..1866662 100644
--- a/HJGL_ZH/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
+++ b/HJGL_ZH/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-57339f4a363b9faca664a99231f321d7a604e379b8ea1faf26c3882a6bc59476
+49c89e1f71aca0e69072600c79f3fe91e94de339
diff --git a/HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache b/HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache
index 3588c06601fcfc103542ff1f192d1965d3828290..4f7b8ca3ba901da2986ea298969d7331e2a589c6 100644
GIT binary patch
literal 9919
zcmcJU4Qw368HVrd^WDuRB)NnZ(gx}Ph0vI*O>hDUX<{6wI3ynv9PoXN%LRDJzM`|k-B&Y;c2@+I=N>B-qpi-y=RRIaAl1fkskf0J&f=bZ$-MQJ!
zddF>($RqjN*}3<7W@dMG_WRa}WFnFH424IQg>5hgcDO~a?$^tW{AEqIQpyk8{-mGp
zuX|2c=WfUI-Fj_fPj9{_-<|L7>g;b;8comHSaX^U&#rWJ?re@#+~O6^%y50uscjtV
zUQ_NZuPgWTlzO}EHFgI(TWRj2Fyl9zYN25_9I8awtvJD1`wICJMp3Ca#Ri7p=P$SY
ziH1E^aX4zx4wIt!uhI+z*7mwx+G-aYbuZJJPqx2aow7a0TS91mz2xll>eFt?@v>|v
zxHmc}%*apgwku7?PbAvg6CE83vZlTU73&p)-3#`
z(=dMj`VkCi+_S5lTX9wV&Q*slUVHw?E~o5xPOa#4_W8b3#g%vbk?`VwSvF!Qlcu%zwbdyCl`{%D4
z&P1S#@%ih5moLBFt=$mJhc|6LIty=WzP~VGds9JY3((ov{LPF{eb5h==;%E3Q}v5=
zui}mcot!eilL>AUm%}3T)0l_Jw4SJ-ADV*G7&z2$YTPpYV1|p)b9w%H<|C!n;S%m5
zT#I4}O|ZKxWo;SFsWhLX`8>^OG^f)nhv}fl>SOCoe-Fqx2D|cV?nFV2J4Ji7UP|F_
zvdylgO3sv@_PKxi9bRMF@!HC@M4~N~P9{V)Kby?u?3D7YEo^28n^t(;_U-5Po}@`^
z_}gzD{Lzst-wl@d0<8EVOnL>+xuxaTbg${TB$4D?Ifbah8E6n^!lb_h6LH{mi92+n
zRjh>a=%?8NljHhh$#8K6T)r<)V9*0_6I*G%PIEcUAk8+KD`>XEFgZT`EEzu9Cv#UP
z;4WO6>uDxwDlj>27c3oo!jJ2j;?~|VVf%eUsT$rZZBvu&QA^vtBeasf>6GZEg~TpvwbHs>C8;ouGeAvg@%`L{Q_TA7Con$eSiqJ
zT5Se7N!D|!_SBS9!mBI8od79ATN^j2wq)C)R-mA=k8CpA+iL2s*UIjA)00v7v7kPD
zIbJSDSNGh;MD^1D*Q?c&oR2%^R@}x+G8w#8lj$l(l~sY5CGet7h&qfa$y-rN-HSx=
z#74=@Ff+}}X>>Hf-7As$K42#|_z06dSe8Yb4~R`J$7^+fY+TgoKv39S!1JFsex8O*--$1|(mb5_tz|3tFRO
zXlsc((IW0rKpZ9Wpw65&F!}P7%)3$3*4;fg72ktVMFKq?c!L4R7qJB1i`r6ckom$5
zm01u
zDKd@{zE_9uF~AwyNccmjMHcJBXb``KQAHw$b!5SS9DrUTA3;sK0EclZ9#u3PCGbie
zIAj2Bg;W9`LoK{PkK;uA7Dg3`+ot0N4LF8f688jZ>S1DrZHXt*B7U!cI7;S#&fH>P
zGK!PTr%+Q&`G7u+7V!rdRU~t>&fH{R4ni-P&!85$HP50!Jg0a#O5_F|x!!=>2B}0o
zkJ_@pZ<1^goZ2&0N*uhrST1~wyC$v%SG;uc$F!j^aut>RA#ilgNA
z=-h4tcRQq#`x0vEOW&?$t>IRke8KVD@N1bRUWP>c8AcV^NtfQqYC|VGpqHJzf||Bw
zU&X0-P0?_a!1HwAxdtHPZ3%oGHMJn*B6|ZZ;;%5ONak5ObESdF@Le+BL@j&{j^af8
z9Yz(2J445TduglBHi5^tkX{6jHul-SdC>}dupGXjZy2Q}?dzKc`w
z9*imyxJ(BwH2`-(FM;o)7Eb#EoQQua7LF3PNXMOGz!e~sxDQcN>$Kn$n+WA*Eb$Rq
z#lK)wkzAp3vj#3xAIbd~waDZ82^z$|6%R*=OzFsW1M+G}CGu0$)KG_-RV?}<9#uw5
zBFwEq?q{EBvDBwHnH@{*3%Tvd$Sq3YR0RJSfPzI1^b;NUu>m*&sT?Rj3Wc{w5NE-t
zB5@z-xDO4u{UPoYIOmRievseB`z^7EPO8NoZ}1N406wmagXZUHw|1nmcGYRO=wOMR#U9R%_3(z?!|R3~#=;)Xh4UOi%Xx&aiosvi;jb9r#Sp$4&e6@a
zi_8mR%$IfMO9m$MX}N^E;jC?2Jp^7D1HPyOj~IZ=%_XoG&T5b{Bv?!4x)}2Xo%y_h
zSq_=&;T%3^8;H9!hI>}WJ!8O)hqz5}Rzs98sm)~e#h6d)%%=>@iIBMk&fyRTh}#;&
zJ*nfKFyQzRLSDr|IBU0M8-Z8EfRF3I#|*&hL*NjcBRjyAMDC0s59`QB49Lk4S%7o&
zG7gh@b&UD2&V0zgtc1)xaQ+`r&t7(NZLE_A^-dm$ce0pY7_#_l``wKryO&?|=66#3
z+@KX7fhr%`xdMb4hPkQZ>UQvu`8y&Y1MBxuo~Rq)eBMRA#)18ov)+m($
ztdYtPG%960YLqgnj7k||8l?;mqhn>PXp}P8i%J>!8KsQjq61(+XOuEJi%J=)8Kn%m
zqEbd+MkxcTsFcx_QOY
Date: Thu, 17 Oct 2024 14:50:41 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj | 2 +-
.../PassFileOneQueStatistic.aspx.cs | 1 +
.../WeldingReport/InspectionBatchItem.aspx.cs | 48 +++++---
HJGL_ZH/FineUIPro.Web/Web.config | 110 +++++++++---------
HJGL_ZH/Model/bin/Release/Model.dll | Bin 1216000 -> 1216512 bytes
HJGL_ZH/Model/bin/Release/Model.pdb | Bin 3380736 -> 3376640 bytes
6 files changed, 86 insertions(+), 75 deletions(-)
diff --git a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
index 8375e0a..f3bcc53 100644
--- a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
@@ -100,7 +100,7 @@
- ..\..\..\..\ZHJA_HJGL\HJGL_ZH\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll
+ ..\..\..\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs
index cea3159..25171ce 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs
+++ b/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
{
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs
index 7262fde..2e5f01c 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs
@@ -118,7 +118,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
string strSql = "select v.*,newid() as New_ID from (SELECT distinct * FROM HJGL_View_InspectionBatch WHERE 1=1";
List listStr = new List();
- if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue!="null")
+ if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null")
{
strSql += " AND ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.drpProjectId.SelectedValue));
@@ -155,7 +155,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
this.GetShowColumn(c.Columns);
}
-
+
}
#endregion
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
// BindGrid();
//}
//#endregion
-
+
#region 分页
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
@@ -227,7 +227,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
#endregion
#region 导出
-
+
/// 导出按钮
///
///
@@ -244,20 +244,20 @@ namespace FineUIPro.Web.HJGL.WeldingReport
// n++;
//}
- Model.Sys_UserShowColumns c = BLL.Sys_UserShowColumnsService.GetColumnsByUserId(this.CurrUser.UserId, "3");
- List columns = new List();
- if (c != null)
- {
- string[] items = c.Columns.Split(',');
- columns = new List(items);
- }
- else
- {
- for (int i=1; i <= Grid1.Columns.Count; i++)
- {
- columns.Add(i.ToString());
- }
- }
+ Model.Sys_UserShowColumns c = BLL.Sys_UserShowColumnsService.GetColumnsByUserId(this.CurrUser.UserId, "3");
+ List columns = new List();
+ if (c != null)
+ {
+ string[] items = ("0," + c.Columns).Split(',');
+ columns = new List(items);
+ }
+ else
+ {
+ for (int i = 1; i <= Grid1.Columns.Count; i++)
+ {
+ columns.Add(i.ToString());
+ }
+ }
Response.ClearContent();
string filename = Funs.GetNewFileName();
//string style = @"