From 70a6901519979a7fcb6f43897b1355becf418c2c Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Wed, 26 Feb 2025 12:42:11 +0800
Subject: [PATCH] =?UTF-8?q?20250226=20=E7=A1=AC=E5=BA=A6=E6=A3=80=E6=B5=8B?=
=?UTF-8?q?=E5=A7=94=E6=89=98=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../HardnessCheckOrderPrint.aspx.cs | 26 ++++++++++++++++--
HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj | 13 +++++----
.../HJGL/HotHardManage/HardTestReport.aspx.cs | 26 ------------------
HJGL_ZH/Model/bin/Debug/Model.dll | Bin 1386496 -> 1386496 bytes
HJGL_ZH/Model/bin/Debug/Model.pdb | Bin 3837440 -> 3837440 bytes
.../Debug/Model.csproj.FileListAbsolute.txt | 1 -
.../Debug/Model.csprojAssemblyReference.cache | Bin 2063 -> 0 bytes
HJGL_ZH/Model/obj/Debug/Model.dll | Bin 1386496 -> 1386496 bytes
HJGL_ZH/Model/obj/Debug/Model.pdb | Bin 3837440 -> 3837440 bytes
9 files changed, 30 insertions(+), 36 deletions(-)
delete mode 100644 HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache
diff --git a/HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessCheckOrderPrint.aspx.cs b/HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessCheckOrderPrint.aspx.cs
index 6780db5..a9c7431 100644
--- a/HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessCheckOrderPrint.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessCheckOrderPrint.aspx.cs
@@ -376,7 +376,7 @@ namespace FineUIPro.Web.ContinuousPrint
ws.GetRow(rowIndex + 6).GetCell(8).SetCellValue("合格值");
region = new CellRangeAddress(rowIndex + 6, rowIndex + 6, 11, 12);
ws.AddMergedRegion(region);
- ws.GetRow(rowIndex + 6).GetCell(11).SetCellValue("≤200");
+ ws.GetRow(rowIndex + 6).GetCell(11).SetCellValue(tbTitle.Rows[0]["STE_Code"].ToString());
//行8
region = new CellRangeAddress(rowIndex + 7, rowIndex + 7, 0, 0);
@@ -428,7 +428,28 @@ namespace FineUIPro.Web.ContinuousPrint
}
#endregion
- rowIndex = tEnd + 2;
+ #region 尾部
+ //创建尾部行
+ ws = ExcelCreateRowTitle(ws, hssfworkbook, tEnd + 1, tEnd + 2, style, 0, 12);
+ ICellStyle endStyleOne = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Left, 10);
+ //创建尾部列
+ region = new CellRangeAddress(tEnd + 1, tEnd + 2, 0, 5);
+ ws.AddMergedRegion(region);
+ ws.GetRow(tEnd + 1).GetCell(0).CellStyle = endStyleOne;
+ ws.GetRow(tEnd + 1).GetCell(0).SetCellValue("委托单位：镇海石化建安工程股份有限公司");
+
+ region = new CellRangeAddress(tEnd + 1, tEnd + 1, 6, 12);
+ ws.AddMergedRegion(region);
+ ws.GetRow(tEnd + 1).GetCell(6).CellStyle = endStyleOne;
+ ws.GetRow(tEnd + 1).GetCell(6).SetCellValue("委托人：");
+
+ region = new CellRangeAddress(tEnd + 2, tEnd + 2, 6, 12);
+ ws.AddMergedRegion(region);
+ ws.GetRow(tEnd + 2).GetCell(6).CellStyle = endStyleOne;
+ ws.GetRow(tEnd + 2).GetCell(6).SetCellValue("日期： 年 月 日");
+ #endregion
+
+ rowIndex = tEnd + 4;
}
}
}
@@ -517,7 +538,6 @@ namespace FineUIPro.Web.ContinuousPrint
return ws;
}
-
///
/// 查询指定条数分页
///
diff --git a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
index d3dafca..d531326 100644
--- a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1197,6 +1197,12 @@
+
+
+
+
+
+
@@ -1372,6 +1378,7 @@
+
@@ -1401,12 +1408,6 @@
-
-
-
-
-
-
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx.cs
index 38d5811..dcd669a 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx.cs
@@ -794,32 +794,6 @@ namespace FineUIPro.Web.HJGL.HotHardManage
i = 1;
}
}
- //var jotIdItems = (from x in hardTestReportItems
- // join y in Funs.DB.HJGL_PW_JointInfo
- // on x.JOT_ID equals y.JOT_ID
-
- // //orderby y.Sort1,y.Sort2,y.Sort3,y.Sort4,y.Sort5
- // select x.JOT_ID + "," + x.HotProessTrustId).Distinct();
- //int i = 1;
- //foreach (var jotIds in jotIdItems)
- //{
- // string jotId = jotIds.Split(',')[0];
- // string hotProessTrustId = jotIds.Split(',')[1];
- // var items = hardTestReportItems.Where(x => x.JOT_ID == jotId && x.HotProessTrustId == hotProessTrustId);
- // foreach (var item in items)
- // {
- // item.Flag = i;
- // BLL.HJGL_CH_HardTestReportService.UpdateCH_HardTestReportItem(item);
- // }
- // if (i == 1 || i == 2)
- // {
- // i++;
- // }
- // else
- // {
- // i = 1;
- // }
- //}
List listStr = new List();
listStr.Add(new SqlParameter("@HardTestReportId", this.HardTestReportId));
listStr.Add(new SqlParameter("@Flag", "0"));
diff --git a/HJGL_ZH/Model/bin/Debug/Model.dll b/HJGL_ZH/Model/bin/Debug/Model.dll
index 00810c3e6c934d97513bddc4e9708e889920364c..e967a3232592fc8611c4c9639fffd0e3d258246a 100644
GIT binary patch
delta 153
zcmZp;5YliVWI_k?xw3tY-L2h>t=&wm-OR1sEUn$Ft=(*`-R!O19If4)t=(L$-Q2C+
zJgwclt=)XB-TbZH0$aNUkA4s^c`3KL_f5CUv?orb`PbZR+7mts0EmzTZT5SB&ibOT$_JoguKr95r!rK!*iY(F7
z*-+Y&&Hw~VKrF)u#CD<#G76#$LBTG;ES&rNr~6gAuWhmPaM^o9db@#w=mmBFNjf+P
diff --git a/HJGL_ZH/Model/bin/Debug/Model.pdb b/HJGL_ZH/Model/bin/Debug/Model.pdb
index 5660151ba1829531a9c62cf3019e1c168cdd3d7a..addd7523ad60e45448bef95fcc4b10cd04b31ded 100644
GIT binary patch
delta 312
zcmZ|LJx;;^0D#f9lmZ0`B5J{wKNS!~QAC9>a}`!tn41vNp&_X;Ve$k{CX#gX01T{>
zu*yQ1G$D?B7hrf7c-GrmwD2LT`h4)!6$L?f{hw8rFMpl)ReLH=%@2Xow+>10-;WB#v;56X-}GjZ+vfkwF$Y!95knk0Zg2|&ceqCaCXz@YjR$0qMGkosP(%r3
lR8YkuYN(@uCR%vHGhXnDHah6y&DEUV-{S0sYx?>>+kY2YXUqTq
diff --git a/HJGL_ZH/Model/obj/Debug/Model.csproj.FileListAbsolute.txt b/HJGL_ZH/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
index ac3b88b..8846963 100644
--- a/HJGL_ZH/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
+++ b/HJGL_ZH/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
@@ -198,4 +198,3 @@ E:\镇海\ZHJA_HJGL\HJGL_ZH\Model\bin\Debug\Model.pdb
E:\镇海\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
E:\镇海\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.dll
E:\镇海\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.pdb
-E:\镇海\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csprojAssemblyReference.cache
diff --git a/HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache b/HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache
deleted file mode 100644
index 3588c06601fcfc103542ff1f192d1965d3828290..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2063
zcmcIl+iuf95OuC~k^+`OGDK
zDkqY3xPY2703m%Iwi_+dAazo&Ih}~9NI*M;ND0bn&UQ3n{`e*A_xS|E_Nd(TTRyJ?MnqgPf-QPDtSHwbC+8=e5Ipc48}@_Aju0VcNHBmz^F?(4S9tB
zQkOKLyv3>8rDMg#(mWr#!-FXmAgZ`&hr6&X_{?`f*!ZC5A3$DbB#Q&eB9NAq%UOj&
z#ZJ=NJlgAaLd={0?EmY{`jcghs(e~wDUVRlP{mbQpT(jE*?Bb7A?*knI9=_Ebnfh}
z-@iM23mymv$KX7b5(4c!$l=1=VOR6v3m20idA-p;zMI`6_2E3ccQ7K)siFg4MwIyn
z6x}5*V?{KJrYHP9U`EE)GAcb8%*`a&1GTZIAjAfiM!BSwKcuIO9%2P|Qjl2Gm~?u(
zR7_1i6)iSOL2S{;0*ns!>!%cS0y*Y_`6DB8BHd(6TVRDwrc|N1X+~$u4?mlvPH8bO
z1?T2s_>(%)s^S#E_A6Bp%yc<}tFs8_5Y8i9K)8r-3E{Ga0)DY}++u(K4;(6)sl0}h
z$gFTu=t7A4MaSrBRlBI|{gmCa@|R>{ubz_uR${Qm9h4;u%4xm+$@
z!7I)s(yTWd53LLajB&(?SK~xXDv7ufCt~7B#A|UPnv+Dl9w(xKNyHm*BAT2;bmBxT
YL=tf|PQ+p*5pTwcSkNTmtr)TL2iM+KNdN!<
diff --git a/HJGL_ZH/Model/obj/Debug/Model.dll b/HJGL_ZH/Model/obj/Debug/Model.dll
index 00810c3e6c934d97513bddc4e9708e889920364c..e967a3232592fc8611c4c9639fffd0e3d258246a 100644
GIT binary patch
delta 153
zcmZp;5YliVWI_k?xw3tY-L2h>t=&wm-OR1sEUn$Ft=(*`-R!O19If4)t=(L$-Q2C+
zJgwclt=)XB-TbZH0$aNUkA4s^c`3KL_f5CUv?orb`PbZR+7mts0EmzTZT5SB&ibOT$_JoguKr95r!rK!*iY(F7
z*-+Y&&Hw~VKrF)u#CD<#G76#$LBTG;ES&rNr~6gAuWhmPaM^o9db@#w=mmBFNjf+P
diff --git a/HJGL_ZH/Model/obj/Debug/Model.pdb b/HJGL_ZH/Model/obj/Debug/Model.pdb
index 5660151ba1829531a9c62cf3019e1c168cdd3d7a..addd7523ad60e45448bef95fcc4b10cd04b31ded 100644
GIT binary patch
delta 312
zcmZ|LJx;;^0D#f9lmZ0`B5J{wKNS!~QAC9>a}`!tn41vNp&_X;Ve$k{CX#gX01T{>
zu*yQ1G$D?B7hrf7c-GrmwD2LT`h4)!6$L?f{hw8rFMpl)ReLH=%@2Xow+>10-;WB#v;56X-}GjZ+vfkwF$Y!95knk0Zg2|&ceqCaCXz@YjR$0qMGkosP(%r3
lR8YkuYN(@uCR%vHGhXnDHah6y&DEUV-{S0sYx?>>+kY2YXUqTq