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

11

Browse Source
This commit is contained in:
佘春生
2024-07-01 09:29:35 +08:00
parent 3990f747ce
commit 26d1774fb1
35 changed files with 1432 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs
+2
View File
@@ -527,6 +527,7 @@ namespace FineUIPro.Web.WelderManage
updateQue.SizesMin = sizesMin;
updateQue.MaterialTypeName = materialTypeName;
updateQue.WeldType = weldType;
updateQue.IsPass = q.IsPass;
BLL.WelderQualifiedService.UpdateWelderQualifiedProject(updateQue);
}
@@ -710,6 +711,7 @@ namespace FineUIPro.Web.WelderManage
}
welderQue.IsPass = true;
#endregion
welderQueList.Add(welderQue);
HJGL/FineUIPro.Web/WelderManage/WelderManage.aspx.cs
+23 -20
View File
@@ -379,7 +379,7 @@ namespace FineUIPro.Web.WelderManage
string strSql = @"SELECT Welder.WelderId, Welder.WelderCode, Welder.WelderName, Welder.UnitId,
Welder.Birthday,(CASE WHEN Welder.Sex=1 THEN '男' ELSE '女' END) AS Sex,
Welder.IdentityCard,Welder.IdentityCard, Welder.CertificateNum, Welder.CertificateValidity,
Welder.IdentityCard, Welder.CertificateNum, Welder.CertificateValidity,
Welder.WelderLevel, Welder.Remark,Unit.UnitName,Welder.IsOnDuty
FROM Welder_Welder AS Welder LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Welder.UnitId
WHERE 1=1 ";
@@ -416,7 +416,7 @@ namespace FineUIPro.Web.WelderManage
//行0
CellRangeAddress region = new CellRangeAddress(rowIndex, rowIndex, 0, 11);
ws.AddMergedRegion(region);
ws.GetRow(rowIndex).GetCell(0).SetCellValue("巴斯夫（广东）一体化项目专用化学品二区\r\n焊工信息登记表");
ws.GetRow(rowIndex).GetCell(0).SetCellValue("巴斯夫（广东）一体化丁辛醇（OXO）\r\n焊工信息登记表");
ws.GetRow(rowIndex).GetCell(0).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, HorizontalAlignment.Center, 16);
//行1
@@ -429,7 +429,7 @@ namespace FineUIPro.Web.WelderManage
ws.GetRow(rowIndex + 2).GetCell(0).SetCellValue("序号");
ws.GetRow(rowIndex + 2).GetCell(1).SetCellValue("焊工姓名");
ws.GetRow(rowIndex + 2).GetCell(2).SetCellValue("考试中心焊工号");
ws.GetRow(rowIndex + 2).GetCell(3).SetCellValue("CC7焊工号");
ws.GetRow(rowIndex + 2).GetCell(3).SetCellValue("CC11焊工号");
ws.GetRow(rowIndex + 2).GetCell(4).SetCellValue("身份证号");
ws.GetRow(rowIndex + 2).GetCell(5).SetCellValue("焊工证号");
ws.GetRow(rowIndex + 2).GetCell(6).SetCellValue("合格项目");
@@ -456,23 +456,26 @@ namespace FineUIPro.Web.WelderManage
{
num = itemWelders.Count - 1;
ws = ExcelCreateRow(ws, hssfworkbook, rowIndex, rowIndex + num, style, 0, 11);
//合并单元格
region = new CellRangeAddress(rowIndex, rowIndex + num, 0, 0);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 1, 1);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 2, 2);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 3, 3);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 4, 4);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 5, 5);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 10, 10);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 11, 11);
ws.AddMergedRegion(region);
if (num > 0)
{
//合并单元格
region = new CellRangeAddress(rowIndex, rowIndex + num, 0, 0);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 1, 1);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 2, 2);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 3, 3);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 4, 4);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 5, 5);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 10, 10);
ws.AddMergedRegion(region);
region = new CellRangeAddress(rowIndex, rowIndex + num, 11, 11);
ws.AddMergedRegion(region);
}
int j = 0;
foreach (var item in itemWelders)
{