diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index b742115..e74c52a 100644
Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ
diff --git a/HJGL/BLL/WeldingProcess/TestPackageManage/TestPackageManageEditService.cs b/HJGL/BLL/WeldingProcess/TestPackageManage/TestPackageManageEditService.cs
index c2f45b3..e60444a 100644
--- a/HJGL/BLL/WeldingProcess/TestPackageManage/TestPackageManageEditService.cs
+++ b/HJGL/BLL/WeldingProcess/TestPackageManage/TestPackageManageEditService.cs
@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using System.Collections;
using System.Web.UI.WebControls;
+using System.Data.SqlClient;
namespace BLL
{
@@ -313,7 +314,32 @@ namespace BLL
}
return isoRate;
}
-
+ public static int countBaseWeldJointCode(string pipelineId)
+ {
+ string sql = "select count(1) from Pipeline_WeldJoint where PipelineId=@PipelineId";
+ SqlParameter[] parameters = new SqlParameter[] {
+ new SqlParameter("@PipelineId",pipelineId)
+ };
+ int count = SQLHelper.getIntValue(sql, parameters);
+ return count;
+ }
+ public static int countWeldJointCode(string pipelineId)
+ {
+ string sql = @"select WeldJointCode=(stuff((select ','+ WeldJonintCode from PTP_PipelineList where PipelineId=@PipelineId and isALL=0 for xml path('')),1,1,''))";
+ SqlParameter[] parameters = new SqlParameter[] {
+ new SqlParameter("@PipelineId",pipelineId)
+ };
+ string strCode = SQLHelper.GetStr(sql, parameters);
+ if (!string.IsNullOrEmpty(strCode))
+ {
+ string[] arr = strCode.Split(',');
+ return arr == null ? 0 : arr.Length;
+ }
+ else
+ {
+ return 0;
+ }
+ }
}
}
diff --git a/HJGL/FineUIPro.Web/File/Excel/试压包导入模版.xlsx b/HJGL/FineUIPro.Web/File/Excel/试压包导入模版.xlsx
index 0c1c81b..e7d4a46 100644
Binary files a/HJGL/FineUIPro.Web/File/Excel/试压包导入模版.xlsx and b/HJGL/FineUIPro.Web/File/Excel/试压包导入模版.xlsx differ
diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
index 6ce8a24..bc5a722 100644
--- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1239,6 +1239,7 @@
+
@@ -5449,6 +5450,13 @@
BItemEndCheck.aspx
+
+ ImportError.aspx
+ ASPXCodeBehind
+
+
+ ImportError.aspx
+
selectJointCode.aspx
ASPXCodeBehind
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx
new file mode 100644
index 0000000..82ab602
--- /dev/null
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx
@@ -0,0 +1,37 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ImportError.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.TestPackageManage.ImportError" %>
+
+
+
+
+
+
+ 试压包导入错误日志
+
+
+
+
+
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.cs
new file mode 100644
index 0000000..7e4f63d
--- /dev/null
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.cs
@@ -0,0 +1,29 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.WeldingProcess.TestPackageManage
+{
+ public partial class ImportError : PageBase
+ {
+ string batchNo = string.Empty;
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ this.batchNo = Request.Params["batchNo"];
+ if (!IsPostBack)
+ {
+ BindGrid();
+ }
+ }
+ void BindGrid()
+ {
+ var list=Funs.DB.PTP_TestPackage_ImportErrorLog.Where(t=>t.BatchNo == batchNo).OrderBy(t=>t.TestPackageNo).ToList();
+ this.Grid1.DataSource = list;
+ this.Grid1.DataBind();
+ }
+ }
+}
\ No newline at end of file
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.designer.cs
new file mode 100644
index 0000000..6b415c3
--- /dev/null
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx.designer.cs
@@ -0,0 +1,53 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.WeldingProcess.TestPackageManage
+{
+
+
+ public partial class ImportError
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// Grid1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid1;
+
+ ///
+ /// lablRemark 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label lablRemark;
+ }
+}
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx
index 5c777b8..5000a85 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx
@@ -217,6 +217,10 @@
Target="Self" EnableResize="true" runat="server" IsModal="true" Width="1024px"
Height="620px">
+
+