diff --git a/HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessCheckOrderPrint.aspx.cs b/HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessCheckOrderPrint.aspx.cs
index 0814e72..cb2adf3 100644
--- a/HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessCheckOrderPrint.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessCheckOrderPrint.aspx.cs
@@ -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;
}
-
///
/// 查询指定条数分页
///
diff --git a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
index af9c681..0bcf8f7 100644
--- a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1198,6 +1198,12 @@
+
+
+
+
+
+
@@ -1374,6 +1380,7 @@
+
@@ -1403,12 +1410,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
new file mode 100644
index 0000000..e967a32
Binary files /dev/null and b/HJGL_ZH/Model/bin/Debug/Model.dll differ
diff --git a/HJGL_ZH/Model/bin/Debug/Model.pdb b/HJGL_ZH/Model/bin/Debug/Model.pdb
new file mode 100644
index 0000000..addd752
Binary files /dev/null and b/HJGL_ZH/Model/bin/Debug/Model.pdb differ
diff --git a/HJGL_ZH/Model/obj/Debug/Model.csproj.FileListAbsolute.txt b/HJGL_ZH/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
index d47e3df..dd78da7 100644
--- a/HJGL_ZH/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
+++ b/HJGL_ZH/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
@@ -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
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 3588c06..0000000
Binary files a/HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache and /dev/null differ
diff --git a/HJGL_ZH/Model/obj/Debug/Model.dll b/HJGL_ZH/Model/obj/Debug/Model.dll
new file mode 100644
index 0000000..e967a32
Binary files /dev/null and b/HJGL_ZH/Model/obj/Debug/Model.dll differ
diff --git a/HJGL_ZH/Model/obj/Debug/Model.pdb b/HJGL_ZH/Model/obj/Debug/Model.pdb
new file mode 100644
index 0000000..addd752
Binary files /dev/null and b/HJGL_ZH/Model/obj/Debug/Model.pdb differ