diff --git a/DataBase/版本日志/HJGLDB_DS_2025-03-21_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-03-21_bwj.sql
deleted file mode 100644
index 9640d5a..0000000
--- a/DataBase/版本日志/HJGLDB_DS_2025-03-21_bwj.sql
+++ /dev/null
@@ -1,74 +0,0 @@
-
-ALTER PROCEDURE [dbo].[HJGL_sp_WeldInspectionCheckRecord]
-(
- @ProjectId NVARCHAR(50)=null,
- @ISO_ID VARCHAR(1000)=NULL,
- @VICheckDate DATETIME=NULL,
- @NDTR_ID VARCHAR(50)=NULL,
- @JOTY_Group NCHAR(1)=NULL,
- @WeldingDate datetime =null
-)
-AS
---ܵԽӺӽͷ/¼
-SELECT ROW_NUMBER() OVER(ORDER BY IsoInfo.ISO_IsoNo,joint.JOT_JointNo)%18 AS Num,NEWID() as New_ID,
- Project.ProjectId,Project.ProjectCode,Project.ProjectName,batchDetail.JOT_ID,
- joint.JOT_JointNo,joint.JOT_JointDesc,joint.ISO_ID,batch.NDTR_ID,
- IsoInfo.ISO_IsoNo,batchDetail.VICheckDate,
- (CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Code+'/'+CellWelder.WED_Code ELSE FloorWelder.WED_Code END) AS WED_Code, --
- (CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Name+'/'+CellWelder.WED_Name ELSE FloorWelder.WED_Name END) AS WED_Name, --
- (CASE WHEN Steel.STE_Code IS NOT NULL AND Steel2.STE_Code IS NOT NULL and Steel.STE_Code!=Steel2.STE_Code
- THEN Steel.STE_Code + '/' + Steel2.STE_Code
- WHEN Steel.STE_Code IS NOT NULL THEN Steel.STE_Code
- ELSE ISNULL(Steel2.STE_Code,'') END) AS STE_Code, --
- (CASE batchDetail.IsVI WHEN 1 THEN '' ELSE NULL END) AS PassVI,
- (CASE batchDetail.IsVI WHEN 0 THEN '' ELSE NULL END) AS NoPassVI,
- (CASE WHEN v.CH_TrustItemID IS NOT NULL THEN '' ELSE NULL END) AS IsTrust,
- (CASE v.States WHEN '2' THEN '' ELSE NULL END ) AS TrustState,
- (SELECT TOP 1 ReportCode FROM dbo.HJGL_CH_TestingReportPrint report
- WHERE report.BatchId=batchDetail.BatchId
- AND report.ISO_ID=batchDetail.ISO_ID AND report.NDT_ID=v.NDT_ID
- AND report.Specifications=joint.JOT_JointDesc) AS ReportCode,
-
-joint.JOT_Location --λ
-,WeldMethod.WME_Name --ӷ
-,CASE WHEN WeldMat.WMT_MatCode IS NULL THEN ISNULL(WeldSilk.WMT_MatCode,'')
- ELSE (CASE WHEN WeldSilk.WMT_MatCode IS NULL
- THEN ISNULL(WeldMat.WMT_MatCode,'')
- ELSE (ISNULL(WeldSilk.WMT_MatCode,'') +'/'+ ISNULL(WeldMat.WMT_MatCode,'')) END) END AS WMT_MatName --ƺ
-,joint.JOT_PrepareTemp --Ԥ¶
-,batchDetail.Remark
-,jointType.JOTY_Group,joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5
-,weldReport.JOT_WeldDate
-FROM dbo.HJGL_BO_BatchDetail batchDetail
-LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
-LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
-LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId
-LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = joint.ISO_ID
-LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=joint.JOT_CellWelder
-LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=joint.JOT_FloorWelder
-LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = joint.STE_ID
-LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=joint.STE_ID2
-LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
-LEFT JOIN (SELECT top 1 trustItem.CH_TrustItemID,trust.CH_NDTMethod AS NDT_ID, trustItem.JOT_ID, trustItem.States
- FROM dbo.HJGL_CH_TrustItem trustItem
- LEFT JOIN dbo.HJGL_CH_Trust trust ON trust.CH_TrustID = trustItem.CH_TrustID
- LEFT JOIN dbo.HJGL_BS_NDTType ndtType on ndtType.NDT_ID=trust.CH_NDTMethod
- WHERE ndtType.NDT_Code LIKE '%RT%') v ON v.JOT_ID=batchDetail.JOT_ID
-
-LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID=joint.WME_ID
-LEFT JOIN HJGL_BS_WeldMaterial AS WeldSilk ON WeldSilk.WMT_ID=joint.JOT_WeldSilk
-LEFT JOIN HJGL_BS_WeldMaterial AS WeldMat ON WeldMat.WMT_ID=joint.JOT_WeldMat
-left join HJGL_BO_WeldReportMain as weldReport on weldReport.DReportID = joint.DReportID
-
-WHERE (jointType.JOTY_Group=@JOTY_Group OR @JOTY_Group IS NULL) AND
- (joint.ProjectId=@projectId OR @projectId IS NULL) AND
- --(joint.ISO_ID in(select Id from dbo.StrToTable(@ISO_ID)) OR @ISO_ID IS NULL)
- (joint.ISO_ID=@ISO_ID or @ISO_ID is null)
- AND (batchDetail.VICheckDate=@VICheckDate OR @VICheckDate IS NULL)
- AND (batch.NDTR_ID=@NDTR_ID OR @NDTR_ID IS NULL)
- AND batchDetail.VICheckDate IS NOT NULL
- and(weldReport.JOT_WeldDate=@WeldingDate or @WeldingDate is null)
-order by joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5
-GO
-
-
diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide
index 6a237fc..bbcdcdb 100644
Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide differ
diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal
index 1422811..76304a9 100644
Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/HJGL_DS/.vs/config/applicationhost.config b/HJGL_DS/.vs/config/applicationhost.config
index 03a3064..befab23 100644
--- a/HJGL_DS/.vs/config/applicationhost.config
+++ b/HJGL_DS/.vs/config/applicationhost.config
@@ -162,7 +162,7 @@
-
+
@@ -170,7 +170,7 @@
-
+
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx
index f1ace64..17f5f5f 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx
@@ -19,9 +19,9 @@
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
@@ -31,7 +31,6 @@
-
@@ -55,12 +54,6 @@
-
-
-
-
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs
index 247bc1d..729876c 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs
@@ -42,67 +42,42 @@ namespace FineUIPro.Web.HJGL.WeldingReport
///
private void BindGrid()
{
- //string strSql = @" SELECT v.ProjectId,project.ProjectCode,project.ProjectName,v.JOTY_Group,
- // (CASE WHEN v.JOTY_Group='1' THEN '对接焊缝' WHEN v.JOTY_Group='2' THEN '角焊缝'
- // WHEN v.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
- // v.VICheckDate,v.NDTR_ID,rate.NDTR_Name
- // FROM
- // (SELECT batch.ProjectId,batchDetail.VICheckDate,batch.NDTR_ID,jointType.JOTY_Group
- // FROM dbo.HJGL_BO_BatchDetail batchDetail
- // LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
- // LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
- // LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
- // WHERE BatchDetail.VICheckDate IS NOT NULL
- // GROUP BY batch.ProjectId,jointType.JOTY_Group,batchDetail.VICheckDate,batch.NDTR_ID) v
- // LEFT JOIN dbo.Base_Project project ON project.ProjectId = v.ProjectId
- // LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = v.NDTR_ID
- // WHERE 1=1";
- string strSql = @"select distinct batch.BatchCode,
- batch.ProjectId,
- batch.NDTR_ID,
- project.ProjectCode,
- project.ProjectName,
- isoinfo.ISO_ID,
- isoinfo.ISO_IsoNo,
- batchDetail.VICheckDate,
- rate.NDTR_Name,
- jointType.JOTY_Group,
- (CASE WHEN jointType.JOTY_Group='1' THEN '对接焊缝'
- WHEN jointType.JOTY_Group='2' THEN '角焊缝'
- WHEN jointType.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType
- from HJGL_BO_BatchDetail as batchDetail
- left join HJGL_BO_Batch as batch on batch.BatchId = batchDetail.BatchId
- left join HJGL_PW_JointInfo as jointInfo on jointInfo.JOT_ID = batchDetail.JOT_ID
- left join HJGL_PW_IsoInfo as isoInfo on isoInfo.ISO_ID= jointInfo.ISO_ID
- left join HJGL_BS_JointType as jointType on jointType.JOTY_ID= jointInfo.JOTY_ID
- left join Base_Project as project on project.ProjectId = batch.ProjectId
- LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where BatchDetail.VICheckDate IS NOT NULL ";
+ string strSql = @" SELECT v.ProjectId,project.ProjectCode,project.ProjectName,v.JOTY_Group,
+ (CASE WHEN v.JOTY_Group='1' THEN '对接焊缝' WHEN v.JOTY_Group='2' THEN '角焊缝'
+ WHEN v.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
+ v.VICheckDate,v.NDTR_ID,rate.NDTR_Name
+ FROM
+ (SELECT batch.ProjectId,batchDetail.VICheckDate,batch.NDTR_ID,jointType.JOTY_Group
+ FROM dbo.HJGL_BO_BatchDetail batchDetail
+ LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
+ LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
+ LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
+ WHERE BatchDetail.VICheckDate IS NOT NULL
+ GROUP BY batch.ProjectId,jointType.JOTY_Group,batchDetail.VICheckDate,batch.NDTR_ID) v
+ LEFT JOIN dbo.Base_Project project ON project.ProjectId = v.ProjectId
+ LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = v.NDTR_ID
+ WHERE 1=1";
List listStr = new List();
if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null")
{
- strSql += " AND batch.ProjectId = @ProjectId";
+ strSql += " AND v.ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.drpProjectId.SelectedValue));
}
if (this.drpJointType.SelectedValue != null && this.drpJointType.SelectedValue != "null")
{
- strSql += " AND jointType.JOTY_Group = @JOTY_Group";
+ strSql += " AND v.JOTY_Group = @JOTY_Group";
listStr.Add(new SqlParameter("@JOTY_Group", this.drpJointType.SelectedValue));
}
if (!string.IsNullOrEmpty(this.txtStartDate.Text))
{
- strSql += " AND batchDetail.VICheckDate >= @StartDate";
+ strSql += " AND VICheckDate >= @StartDate";
listStr.Add(new SqlParameter("@StartDate", Convert.ToDateTime(this.txtStartDate.Text)));
}
if (!string.IsNullOrEmpty(this.txtEndDate.Text))
{
- strSql += " AND batchDetail.VICheckDate <= @EndDate";
+ strSql += " AND VICheckDate <= @EndDate";
listStr.Add(new SqlParameter("@EndDate", Convert.ToDateTime(this.txtEndDate.Text)));
}
- if (!string.IsNullOrEmpty(this.txtIsoNo.Text.Trim()))
- {
- strSql += " AND isoinfo.ISO_IsoNo like @isoNo";
- listStr.Add(new SqlParameter("@isoNo", "%" + this.txtIsoNo.Text.Trim() + "%"));
- }
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -139,9 +114,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport
string projectId = Grid1.SelectedRow.DataKeys[0].ToString();
string ndtrId = Grid1.SelectedRow.DataKeys[1].ToString();
string jotyGroup = Grid1.SelectedRow.DataKeys[2].ToString();
- string vICheckDate = Grid1.Rows[i].Values[5].ToString();
- string isoId = Grid1.SelectedRow.DataKeys[3].ToString();
- PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WeldInspectionCheckRecordItem.aspx?projectId={0}&ndtrId={1}&vICheckDate={2}&jotyGroup={3}&isoid={4}", projectId, ndtrId, vICheckDate, jotyGroup, isoId, "编辑 - ")));
+ string vICheckDate = Grid1.Rows[i].Values[3].ToString();
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WeldInspectionCheckRecordItem.aspx?projectId={0}&ndtrId={1}&vICheckDate={2}&jotyGroup={3}", projectId, ndtrId, vICheckDate, jotyGroup, "编辑 - ")));
}
#region 查询
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.designer.cs
index 7df1250..7ff4915 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.designer.cs
@@ -84,15 +84,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
///
protected global::FineUIPro.DropDownList drpProjectId;
- ///
- /// txtIsoNo 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.TextBox txtIsoNo;
-
///
/// drpJointType 控件。
///
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx
index ad135ec..97243de 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx
@@ -16,10 +16,10 @@
- <%--
- --%>
+
<%----%>
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs
index 9c89c3d..224a916 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs
@@ -66,18 +66,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport
}
}
- public string ISO_ID
- {
- get
- {
- return (string)ViewState["ISO_ID"];
- }
- set
- {
- ViewState["ISO_ID"] = value;
- }
- }
-
///
/// 加载页面
///
@@ -91,20 +79,18 @@ namespace FineUIPro.Web.HJGL.WeldingReport
this.NDTR_ID = Request.Params["ndtrId"];
this.VICheckDate = Request.Params["vICheckDate"];
this.JOTY_Group = Request.Params["jotyGroup"];
- this.ISO_ID = Request.Params["isoid"];
-
- //this.drpIsoId.DataTextField = "ISO_IsoNo";
- //this.drpIsoId.DataValueField = "ISO_ID";
- //var isoList = (from x in Funs.DB.HJGL_BO_BatchDetail
- // join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId
- // join j in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals j.JOT_ID
- // join z in Funs.DB.HJGL_PW_IsoInfo on j.ISO_ID equals z.ISO_ID
- // join n in Funs.DB.HJGL_BS_JointType on j.JOTY_ID equals n.JOTY_ID
- // where n.JOTY_Group == JOTY_Group && y.ProjectId == ProjectId && y.NDTR_ID == NDTR_ID
- // && x.VICheckDate == Convert.ToDateTime(this.VICheckDate)
- // select new { z.ISO_ID, z.ISO_IsoNo }).Distinct();
- //this.drpIsoId.DataSource = isoList;
- //this.drpIsoId.DataBind();
+ this.drpIsoId.DataTextField = "ISO_IsoNo";
+ this.drpIsoId.DataValueField = "ISO_ID";
+ var isoList = (from x in Funs.DB.HJGL_BO_BatchDetail
+ join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId
+ join j in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals j.JOT_ID
+ join z in Funs.DB.HJGL_PW_IsoInfo on j.ISO_ID equals z.ISO_ID
+ join n in Funs.DB.HJGL_BS_JointType on j.JOTY_ID equals n.JOTY_ID
+ where n.JOTY_Group == JOTY_Group && y.ProjectId == ProjectId && y.NDTR_ID == NDTR_ID
+ && x.VICheckDate == Convert.ToDateTime(this.VICheckDate)
+ select new { z.ISO_ID, z.ISO_IsoNo }).Distinct();
+ this.drpIsoId.DataSource = isoList;
+ this.drpIsoId.DataBind();
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
BindGrid();
@@ -117,10 +103,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
listStr.Add(new SqlParameter("@ProjectId", ProjectId));
}
- if (!string.IsNullOrEmpty(this.ISO_ID))
- {
- listStr.Add(new SqlParameter("@ISO_ID", this.ISO_ID));
- }
if (!string.IsNullOrEmpty(this.VICheckDate))
{
listStr.Add(new SqlParameter("@VICheckDate", Convert.ToDateTime(VICheckDate).ToShortDateString()));
@@ -166,10 +148,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
listStr.Add(new SqlParameter("@ProjectId", ProjectId));
}
- if (!string.IsNullOrEmpty(this.ISO_ID))
- {
- listStr.Add(new SqlParameter("@ISO_ID", this.ISO_ID));
- }
+
if (!string.IsNullOrEmpty(this.VICheckDate))
{
listStr.Add(new SqlParameter("@VICheckDate", Convert.ToDateTime(VICheckDate).ToShortDateString()));
@@ -184,19 +163,20 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
listStr.Add(new SqlParameter("@JOTY_Group", this.JOTY_Group));
}
- //if (!string.IsNullOrEmpty(this.drpIsoId.SelectedValue))
- //{
- // string iso_Ids = string.Empty;
- // foreach (var item in this.drpIsoId.SelectedValueArray)
- // {
- // iso_Ids += item + ",";
- // }
- // if (!string.IsNullOrEmpty(iso_Ids))
- // {
- // iso_Ids = iso_Ids.Substring(0, iso_Ids.LastIndexOf(","));
- // }
- // listStr.Add(new SqlParameter("@ISO_ID", iso_Ids));
- //}
+
+ if (!string.IsNullOrEmpty(this.drpIsoId.SelectedValue))
+ {
+ string iso_Ids = string.Empty;
+ foreach (var item in this.drpIsoId.SelectedValueArray)
+ {
+ iso_Ids += item + ",";
+ }
+ if (!string.IsNullOrEmpty(iso_Ids))
+ {
+ iso_Ids = iso_Ids.Substring(0, iso_Ids.LastIndexOf(","));
+ }
+ listStr.Add(new SqlParameter("@ISO_ID", iso_Ids));
+ }
if (!string.IsNullOrEmpty(this.drpWeldingDate.SelectedText) && this.drpWeldingDate.SelectedValue != BLL.Const._Null)
{
listStr.Add(new SqlParameter("@WeldingDate", Funs.GetNewDateTime(this.drpWeldingDate.SelectedText)));
@@ -266,7 +246,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
protected void btnPrint_Click(object sender, EventArgs e)
{
string projectName = string.Empty;
- //string isoIds = string.Empty;
+ string isoIds = string.Empty;
//string parameter = string.Empty;
//string varValue = string.Empty;
string ndtrName = string.Empty;
@@ -298,21 +278,22 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
vICheckDate = Convert.ToDateTime(VICheckDate).ToShortDateString();
}
- //if (this.drpIsoId.SelectedValueArray.Count() > 0)
- //{
- // foreach (var item in this.drpIsoId.SelectedValueArray)
- // {
- // isoIds += item + ",";
- // }
- // if (!string.IsNullOrEmpty(isoIds))
- // {
- // isoIds = isoIds.Substring(0, isoIds.LastIndexOf(','));
- // }
- //}
- //else
- //{
- // isoIds = null;
- //}
+
+ if (this.drpIsoId.SelectedValueArray.Count() > 0)
+ {
+ foreach (var item in this.drpIsoId.SelectedValueArray)
+ {
+ isoIds += item + ",";
+ }
+ if (!string.IsNullOrEmpty(isoIds))
+ {
+ isoIds = isoIds.Substring(0, isoIds.LastIndexOf(','));
+ }
+ }
+ else
+ {
+ isoIds = null;
+ }
//parameter = ProjectId + "|" + isoIds + "|" + vICheckDate.Replace("/", "-") + "|" + NDTR_ID + "|" + JOTY_Group;
//varValue = projectName + "|" + this.Grid1.RecordCount + "|" + vICheckDate.Replace("/", "-") + "|" + vICheckDate.Replace("/", "-") + "|" + ndtrName;
@@ -326,7 +307,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
List listStr = new List();
listStr.Add(new SqlParameter("@ProjectId", ProjectId));
- listStr.Add(new SqlParameter("@ISO_ID", this.ISO_ID));
+ listStr.Add(new SqlParameter("@ISO_ID", isoIds));
listStr.Add(new SqlParameter("@VICheckDate", vICheckDate.Replace("/", "-")));
listStr.Add(new SqlParameter("@NDTR_ID", this.NDTR_ID));
listStr.Add(new SqlParameter("@JOTY_Group", JOTY_Group));
@@ -424,7 +405,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
protected void btnPrintNew_Click(object sender, EventArgs e)
{
string projectName = string.Empty;
- //string isoIds = string.Empty;
+ string isoIds = string.Empty;
//string parameter = string.Empty;
//string varValue = string.Empty;
string ndtrName = string.Empty;
@@ -455,21 +436,21 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
vICheckDate = Convert.ToDateTime(VICheckDate).ToShortDateString();
}
- //if (this.drpIsoId.SelectedValueArray.Count() > 0)
- //{
- // foreach (var item in this.drpIsoId.SelectedValueArray)
- // {
- // isoIds += item + ",";
- // }
- // if (!string.IsNullOrEmpty(isoIds))
- // {
- // isoIds = isoIds.Substring(0, isoIds.LastIndexOf(','));
- // }
- //}
- //else
- //{
- // isoIds = null;
- //}
+ if (this.drpIsoId.SelectedValueArray.Count() > 0)
+ {
+ foreach (var item in this.drpIsoId.SelectedValueArray)
+ {
+ isoIds += item + ",";
+ }
+ if (!string.IsNullOrEmpty(isoIds))
+ {
+ isoIds = isoIds.Substring(0, isoIds.LastIndexOf(','));
+ }
+ }
+ else
+ {
+ isoIds = null;
+ }
//parameter = ProjectId + "|" + isoIds + "|" + vICheckDate.Replace("/", "-") + "|" + NDTR_ID + "|" + JOTY_Group;
//varValue = projectName + "|" + this.Grid1.RecordCount + "|" + vICheckDate.Replace("/", "-") + "|" + vICheckDate.Replace("/", "-") + "|" + ndtrName;
@@ -482,7 +463,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
List listStr = new List();
listStr.Add(new SqlParameter("@ProjectId", ProjectId));
- listStr.Add(new SqlParameter("@ISO_ID",this.ISO_ID));
+ listStr.Add(new SqlParameter("@ISO_ID", isoIds));
listStr.Add(new SqlParameter("@VICheckDate", vICheckDate.Replace("/", "-")));
listStr.Add(new SqlParameter("@NDTR_ID", this.NDTR_ID));
listStr.Add(new SqlParameter("@JOTY_Group", JOTY_Group));
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.designer.cs
index 3a8af43..bfcaa71 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.designer.cs
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
///
protected global::FineUIPro.Toolbar Toolbar2;
+ ///
+ /// drpIsoId 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpIsoId;
+
///
/// drpWeldingDate 控件。
///