shecs
/
ZHJA_HJGL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

This commit is contained in:
佘春生 2025-02-26 17:23:32 +08:00
parent a82e87e8e8 70a6901519
commit 54770795f5
9 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessCheckOrderPrint.aspx.cs
View File

@ -385,7 +385,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);
@ -437,7 +437,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;
}
}
}
@ -526,7 +547,6 @@ namespace FineUIPro.Web.ContinuousPrint
return ws;
}
/// <summary>
/// 查询指定条数分页
/// </summary>

13
HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -1198,6 +1198,12 @@
<Content Include="Login.aspx" />
<Content Include="AttachFile\fileupload.ashx" />
<Content Include="Captcha\captcha.ashx" />
<Content Include="OfficeControl\ntkoofficecontrol.js" />
<Content Include="OfficeControl\ntkosigntool.cab" />
<Content Include="OfficeControl\OfficeControl.cab" />
<Content Include="OfficeControl\OfficeControl.ocx" />
<Content Include="OfficeControl\signtoolcontrol.js" />
<Content Include="OfficeControl\手工卸载安装NTKO OFFICE文档控件.txt" />
<Content Include="RLSB\CheckConfirm.aspx" />
<Content Include="RLSB\FaceConfirm.aspx" />
<Content Include="RLSB\UploadImageCheck.aspx" />
@ -1374,6 +1380,7 @@
<None Include="File\Word\Unqualified\工程复工报告.doc" />
<None Include="File\人脸扫描手动注册.rar" />
<Content Include="ModelPath.ini" />
<Content Include="OfficeControl\~%24KO_OFFICE文档控件开发接口参考V5002.doc" />
<None Include="res\extjs\res\images\access\form\clear-trigger.psd" />
<None Include="res\extjs\res\images\access\form\date-trigger.psd" />
<None Include="res\extjs\res\images\access\form\search-trigger.psd" />
@ -1403,12 +1410,6 @@
<None Include="res\images\Thumbs.db" />
<Content Include="LogOff.aspx" />
<Content Include="ntko.js" />
<Content Include="OfficeControl\ntkoofficecontrol.js" />
<Content Include="OfficeControl\ntkosigntool.cab" />
<Content Include="OfficeControl\OfficeControl.cab" />
<Content Include="OfficeControl\OfficeControl.ocx" />
<Content Include="OfficeControl\signtoolcontrol.js" />
<Content Include="OfficeControl\手工卸载安装NTKO OFFICE文档控件.txt" />
<Content Include="OperationError.aspx" />
<Content Include="APPDownload.aspx" />
<Content Include="res\css\common.css" />

26
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx.cs
View File

@ -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<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@HardTestReportId", this.HardTestReportId));
listStr.Add(new SqlParameter("@Flag", "0"));

BIN
HJGL_ZH/Model/bin/Debug/Model.dll Normal file
View File

Binary file not shown.

BIN
HJGL_ZH/Model/bin/Debug/Model.pdb Normal file
View File

Binary file not shown.

3
HJGL_ZH/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
View File

@ -198,6 +198,7 @@ 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
<<<<<<< HEAD
E:\镇海\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csprojAssemblyReference.cache
E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\bin\Debug\Model.dll
E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\bin\Debug\Model.pdb
@ -208,3 +209,5 @@ E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csproj.CoreCompileInpu
E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csproj.Up2Date
E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.dll
E:\MyProject\ZHHJ\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.pdb
=======
>>>>>>> 70a6901519979a7fcb6f43897b1355becf418c2c

BIN
HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache
View File

Binary file not shown.

BIN
HJGL_ZH/Model/obj/Debug/Model.dll Normal file
View File

Binary file not shown.

BIN
HJGL_ZH/Model/obj/Debug/Model.pdb Normal file
View File

Binary file not shown.