20250321 修改焊接接头报验检查记录

DataBase/版本日志/HJGLDB_DS_2025-03-21_bwj.sql

@@ -0,0 +1,74 @@
+
+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
+
+

HJGL_DS/.vs/config/applicationhost.config

@@ -162,7 +162,7 @@
             </site>
             <site name="FineUIPro.Web" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web" />
+                    <virtualDirectory path="/" physicalPath="E:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:64304:localhost" />
@@ -170,7 +170,7 @@
             </site>
             <site name="WebAPI" id="3">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\工作\鼎盛\HJGL_DS\HJGL_DS\WebAPI" />
+                    <virtualDirectory path="/" physicalPath="E:\鼎盛\HJGL_DS\HJGL_DS\WebAPI" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:32379:localhost" />

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx

@@ -19,9 +19,9 @@
         ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
         <Items>
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管道对接焊接接头报检/检查记录" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="ProjectId,NDTR_ID,JOTY_Group" AllowCellEditing="true"
+                runat="server" BoxFlex="1" DataKeyNames="ProjectId,NDTR_ID,JOTY_Group,ISO_ID" AllowCellEditing="true"
                 EnableColumnLines="true" ClicksToEdit="2" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
-                AllowSorting="true"  SortField="ProjectCode,VICheckDate,NDTR_Name" SortDirection="ASC" OnSort="Grid1_Sort" 
+                AllowSorting="true"  SortField="ProjectCode,ISO_IsoNo,VICheckDate,NDTR_Name" SortDirection="ASC" OnSort="Grid1_Sort" 
                 AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
                 >
                 <Toolbars>
@@ -31,6 +31,7 @@
                             <f:DropDownList ID="drpProjectId" runat="server" Label="施工号" LabelAlign="Right" Width="250px"
                                 EnableEdit="true" AutoSelectFirstItem="false" AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged">
                             </f:DropDownList>
+                         <f:TextBox ID="txtIsoNo" runat="server" Label="管线号" LabelAlign="Right" ></f:TextBox>
                              <f:DropDownList ID="drpJointType" runat="server" Label="焊缝类型" LabelAlign="Right" Width="250px" >
                             </f:DropDownList>
                              <f:DatePicker ID="txtStartDate" Label="外观检查日期" runat="server"  LabelWidth="100px" DateFormatString="yyyy-MM-dd">
@@ -54,6 +55,12 @@
                     <f:RenderField HeaderText="项目名称" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
                         FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="240px">
                     </f:RenderField>
+                    <f:RenderField HeaderText="管线号" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" SortField="ISO_IsoNo"
+                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="180px">
+                    </f:RenderField> 
+                    <f:RenderField HeaderText="批编号" ColumnID="BatchCode" DataField="BatchCode" SortField="BatchCode"
+                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="180px">
+                    </f:RenderField> 
                     <f:RenderField HeaderText="外观检查日期" ColumnID="VICheckDate" DataField="VICheckDate"
                         SortField="VICheckDate" FieldType="Date" Renderer="Date" HeaderTextAlign="Center"
                         TextAlign="Left" Width="150px">

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.cs

@@ -42,42 +42,67 @@ namespace FineUIPro.Web.HJGL.WeldingReport
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @" SELECT v.ProjectId,project.ProjectCode,project.ProjectName,v.JOTY_Group,
+            //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 '角焊缝' 
+            //                          (CASE WHEN v.JOTY_Group='1' THEN '对接焊缝' WHEN v.JOTY_Group='2' THEN '角焊缝' 
-                                            WHEN v.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
+            //                                WHEN v.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
-                                     v.VICheckDate,v.NDTR_ID,rate.NDTR_Name
+            //                         v.VICheckDate,v.NDTR_ID,rate.NDTR_Name
-                                FROM
+            //                    FROM
-                                  (SELECT batch.ProjectId,batchDetail.VICheckDate,batch.NDTR_ID,jointType.JOTY_Group
+            //                      (SELECT batch.ProjectId,batchDetail.VICheckDate,batch.NDTR_ID,jointType.JOTY_Group
-                                     FROM  dbo.HJGL_BO_BatchDetail batchDetail
+            //                         FROM  dbo.HJGL_BO_BatchDetail batchDetail
-                                           LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
+            //                               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_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
-                                           LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
+            //                               LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
-                                    WHERE BatchDetail.VICheckDate IS NOT NULL
+            //                        WHERE BatchDetail.VICheckDate IS NOT NULL
-                                         GROUP BY batch.ProjectId,jointType.JOTY_Group,batchDetail.VICheckDate,batch.NDTR_ID) v
+            //                             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.Base_Project project ON project.ProjectId = v.ProjectId
-                                   LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = v.NDTR_ID    
+            //                       LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = v.NDTR_ID    
-                               WHERE 1=1";
+            //                   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 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null")
             {
-                strSql += " AND v.ProjectId = @ProjectId";
+                strSql += " AND batch.ProjectId = @ProjectId";
                 listStr.Add(new SqlParameter("@ProjectId", this.drpProjectId.SelectedValue));
             }
             if (this.drpJointType.SelectedValue != null && this.drpJointType.SelectedValue != "null")
             {
-                strSql += " AND v.JOTY_Group = @JOTY_Group";
+                strSql += " AND jointType.JOTY_Group = @JOTY_Group";
                 listStr.Add(new SqlParameter("@JOTY_Group", this.drpJointType.SelectedValue));
             }
             if (!string.IsNullOrEmpty(this.txtStartDate.Text))
             {
-                strSql += " AND VICheckDate >= @StartDate";
+                strSql += " AND batchDetail.VICheckDate >= @StartDate";
                 listStr.Add(new SqlParameter("@StartDate", Convert.ToDateTime(this.txtStartDate.Text)));
             }
             if (!string.IsNullOrEmpty(this.txtEndDate.Text))
             {
-                strSql += " AND VICheckDate <= @EndDate";
+                strSql += " AND batchDetail.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);
@@ -114,8 +139,9 @@ 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[3].ToString();
+            string vICheckDate = Grid1.Rows[i].Values[5].ToString();
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WeldInspectionCheckRecordItem.aspx?projectId={0}&ndtrId={1}&vICheckDate={2}&jotyGroup={3}", projectId, ndtrId, vICheckDate, jotyGroup, "编辑 - ")));
+            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, "编辑 - ")));
         }
 
         #region 查询

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecord.aspx.designer.cs

@@ -84,6 +84,15 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectId;
         
+        /// <summary>
+        /// txtIsoNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIsoNo;
+        
         /// <summary>
         /// drpJointType 控件。
         /// </summary>

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx

@@ -16,10 +16,10 @@
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
                         <Items>
-                            <f:DropDownList ID="drpIsoId" runat="server" Label="管线" LabelAlign="Right" Width="300px"
+                            <%--<f:DropDownList ID="drpIsoId" runat="server" Label="管线" LabelAlign="Right" Width="300px"
                                 EnableCheckBoxSelect="true" EnableEdit="true" EnableMultiSelect="true" AutoSelectFirstItem="false"
                                 AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged">
-                            </f:DropDownList>
+                            </f:DropDownList>--%>
                             <%--<f:DatePicker ID ="txtWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right" AutoPostBack="true" OnTextChanged="Text_TextChanged"></f:DatePicker>--%>
                             <f:DropDownList ID="drpWeldingDate" runat="server" Label="焊接日期" LabelAlign="Right" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="Text_TextChanged"></f:DropDownList>
                             <f:ToolbarFill ID="ToolbarFill1" runat="server">

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs

@@ -66,6 +66,18 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             }
         }
 
+        public string ISO_ID
+        {
+            get
+            {
+                return (string)ViewState["ISO_ID"];
+            }
+            set
+            {
+                ViewState["ISO_ID"] = value;
+            }
+        }
+
         /// <summary>
         /// 加载页面
         /// </summary>
@@ -79,18 +91,20 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                 this.NDTR_ID = Request.Params["ndtrId"];
                 this.VICheckDate = Request.Params["vICheckDate"];
                 this.JOTY_Group = Request.Params["jotyGroup"];
-                this.drpIsoId.DataTextField = "ISO_IsoNo";
+                this.ISO_ID = Request.Params["isoid"];
-                this.drpIsoId.DataValueField = "ISO_ID";
+
-                var isoList = (from x in Funs.DB.HJGL_BO_BatchDetail
+                //this.drpIsoId.DataTextField = "ISO_IsoNo";
-                               join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId
+                //this.drpIsoId.DataValueField = "ISO_ID";
-                               join j in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals j.JOT_ID
+                //var isoList = (from x in Funs.DB.HJGL_BO_BatchDetail
-                               join z in Funs.DB.HJGL_PW_IsoInfo on j.ISO_ID equals z.ISO_ID
+                //               join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId
-                               join n in Funs.DB.HJGL_BS_JointType on j.JOTY_ID equals n.JOTY_ID
+                //               join j in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals j.JOT_ID
-                               where n.JOTY_Group == JOTY_Group && y.ProjectId == ProjectId && y.NDTR_ID == NDTR_ID
+                //               join z in Funs.DB.HJGL_PW_IsoInfo on j.ISO_ID equals z.ISO_ID
-                                     && x.VICheckDate == Convert.ToDateTime(this.VICheckDate)
+                //               join n in Funs.DB.HJGL_BS_JointType on j.JOTY_ID equals n.JOTY_ID
-                               select new { z.ISO_ID, z.ISO_IsoNo }).Distinct();
+                //               where n.JOTY_Group == JOTY_Group && y.ProjectId == ProjectId && y.NDTR_ID == NDTR_ID
-                this.drpIsoId.DataSource = isoList;
+                //                     && x.VICheckDate == Convert.ToDateTime(this.VICheckDate)
-                this.drpIsoId.DataBind();
+                //               select new { z.ISO_ID, z.ISO_IsoNo }).Distinct();
+                //this.drpIsoId.DataSource = isoList;
+                //this.drpIsoId.DataBind();
 
                 this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                 BindGrid();
@@ -103,6 +117,10 @@ 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()));
@@ -148,7 +166,10 @@ 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()));
@@ -163,20 +184,19 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             {
                 listStr.Add(new SqlParameter("@JOTY_Group", this.JOTY_Group));
             }
-
+            //if (!string.IsNullOrEmpty(this.drpIsoId.SelectedValue))
-            if (!string.IsNullOrEmpty(this.drpIsoId.SelectedValue))
+            //{
-            {
+            //    string iso_Ids = string.Empty;
-                string iso_Ids = string.Empty;
+            //    foreach (var item in this.drpIsoId.SelectedValueArray)
-                foreach (var item in this.drpIsoId.SelectedValueArray)
+            //    {
-                {
+            //        iso_Ids += item + ",";
-                    iso_Ids += item + ",";
+            //    }
-                }
+            //    if (!string.IsNullOrEmpty(iso_Ids))
-                if (!string.IsNullOrEmpty(iso_Ids))
+            //    {
-                {
+            //        iso_Ids = iso_Ids.Substring(0, iso_Ids.LastIndexOf(","));
-                    iso_Ids = iso_Ids.Substring(0, iso_Ids.LastIndexOf(","));
+            //    }
-                }
+            //    listStr.Add(new SqlParameter("@ISO_ID", iso_Ids));
-                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)));
@@ -246,7 +266,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;
@@ -278,22 +298,21 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             {
                 vICheckDate = Convert.ToDateTime(VICheckDate).ToShortDateString();
             }
-
+            //if (this.drpIsoId.SelectedValueArray.Count() > 0)
-            if (this.drpIsoId.SelectedValueArray.Count() > 0)
+            //{
-            {
+            //    foreach (var item in this.drpIsoId.SelectedValueArray)
-                foreach (var item in this.drpIsoId.SelectedValueArray)
+            //    {
-                {
+            //        isoIds += item + ",";
-                    isoIds += item + ",";
+            //    }
-                }
+            //    if (!string.IsNullOrEmpty(isoIds))
-                if (!string.IsNullOrEmpty(isoIds))
+            //    {
-                {
+            //        isoIds = isoIds.Substring(0, isoIds.LastIndexOf(','));
-                    isoIds = isoIds.Substring(0, isoIds.LastIndexOf(','));
+            //    }
-                }
+            //}
-            }
+            //else
-            else
+            //{
-            {
+            //    isoIds = null;
-                isoIds = null;
+            //}
-            }
 
             //parameter = ProjectId + "|" + isoIds + "|" + vICheckDate.Replace("/", "-") + "|" + NDTR_ID + "|" + JOTY_Group;
             //varValue = projectName + "|" + this.Grid1.RecordCount + "|" + vICheckDate.Replace("/", "-") + "|" + vICheckDate.Replace("/", "-") + "|" + ndtrName;
@@ -307,7 +326,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
 
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", ProjectId));
-            listStr.Add(new SqlParameter("@ISO_ID", isoIds));
+            listStr.Add(new SqlParameter("@ISO_ID", this.ISO_ID));
             listStr.Add(new SqlParameter("@VICheckDate", vICheckDate.Replace("/", "-")));
             listStr.Add(new SqlParameter("@NDTR_ID", this.NDTR_ID));
             listStr.Add(new SqlParameter("@JOTY_Group", JOTY_Group));
@@ -405,7 +424,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;
@@ -436,21 +455,21 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             {
                 vICheckDate = Convert.ToDateTime(VICheckDate).ToShortDateString();
             }
-            if (this.drpIsoId.SelectedValueArray.Count() > 0)
+            //if (this.drpIsoId.SelectedValueArray.Count() > 0)
-            {
+            //{
-                foreach (var item in this.drpIsoId.SelectedValueArray)
+            //    foreach (var item in this.drpIsoId.SelectedValueArray)
-                {
+            //    {
-                    isoIds += item + ",";
+            //        isoIds += item + ",";
-                }
+            //    }
-                if (!string.IsNullOrEmpty(isoIds))
+            //    if (!string.IsNullOrEmpty(isoIds))
-                {
+            //    {
-                    isoIds = isoIds.Substring(0, isoIds.LastIndexOf(','));
+            //        isoIds = isoIds.Substring(0, isoIds.LastIndexOf(','));
-                }
+            //    }
-            }
+            //}
-            else
+            //else
-            {
+            //{
-                isoIds = null;
+            //    isoIds = null;
-            }
+            //}
 
             //parameter = ProjectId + "|" + isoIds + "|" + vICheckDate.Replace("/", "-") + "|" + NDTR_ID + "|" + JOTY_Group;
             //varValue = projectName + "|" + this.Grid1.RecordCount + "|" + vICheckDate.Replace("/", "-") + "|" + vICheckDate.Replace("/", "-") + "|" + ndtrName;
@@ -463,7 +482,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
 
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", ProjectId));
-            listStr.Add(new SqlParameter("@ISO_ID", isoIds));
+            listStr.Add(new SqlParameter("@ISO_ID",this.ISO_ID));
             listStr.Add(new SqlParameter("@VICheckDate", vICheckDate.Replace("/", "-")));
             listStr.Add(new SqlParameter("@NDTR_ID", this.NDTR_ID));
             listStr.Add(new SqlParameter("@JOTY_Group", JOTY_Group));

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.designer.cs

@@ -57,15 +57,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
         
-        /// <summary>
-        /// drpIsoId 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpIsoId;
-        
         /// <summary>
         /// drpWeldingDate 控件。
         /// </summary>

HJGL_DS/FineUIPro.Web/Web.config

@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\SQL2019;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="诺必达焊接管理系统"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -50,7 +50,7 @@
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
       <add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1">
+    <compilation debug="false" targetFramework="4.6.1">
       <assemblies>
         <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
       </assemblies>

HJGL_DS/WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />