1

DataBase/版本日志/HJGLDB_DS_2026-07-02_bwj.sql

@@ -0,0 +1,75 @@
+
+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.WeldName IS NULL THEN ISNULL(WeldSilk.WeldName,'')
+	ELSE (CASE WHEN WeldSilk.WeldName IS NULL
+		 THEN ISNULL(WeldMat.WeldName,'')
+		ELSE (ISNULL(WeldSilk.WeldName,'') +'/'+ ISNULL(WeldMat.WeldName,'')) 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 View_WeldInfoDropDownLists as WeldMat on WeldMat.WeldId = joint.JOT_WeldMat and WeldMat.WeldTypeName like '%보係%'
+LEFT JOIN View_WeldInfoDropDownLists as WeldSilk on WeldSilk.WeldId = joint.JOT_WeldSilk and WeldSilk.WeldTypeName like '%보介%'
+
+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=@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 joint.DReportID is not 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/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs

@@ -22,11 +22,17 @@ namespace FineUIPro.Web.ContinuousPrint
         {
             if (!IsPostBack)
             {
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.txtProjectCode.Text = BLL.Base_ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectCode;
+                }
                 BindGrid();
+                this.Grid1.SelectedRowID = this.CurrUser.LoginProjectId;
+                //BindGrid1(this.CurrUser.LoginProjectId);
+                Grid1_RowClick(sender, null);
             }
         }
 
-
         #region 绑定Grid1
         /// <summary>
         /// 绑定Grid1

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj

@@ -7010,7 +7010,7 @@
     </Compile>
     <Compile Include="JGZL\Cover.aspx.cs">
       <DependentUpon>Cover.aspx</DependentUpon>
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="JGZL\Cover.aspx.designer.cs">
       <DependentUpon>Cover.aspx</DependentUpon>
@@ -7080,7 +7080,7 @@
     </Compile>
     <Compile Include="JGZL\PressureTestOfPipelineSystemRecord.aspx.cs">
       <DependentUpon>PressureTestOfPipelineSystemRecord.aspx</DependentUpon>
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="JGZL\PressureTestOfPipelineSystemRecord.aspx.designer.cs">
       <DependentUpon>PressureTestOfPipelineSystemRecord.aspx</DependentUpon>
@@ -7149,14 +7149,14 @@
       <DependentUpon>CommencementReportEdit.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecord.aspx.cs">
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
       <DependentUpon>ConcealedWorksInspectionRecord.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecord.aspx.designer.cs">
       <DependentUpon>ConcealedWorksInspectionRecord.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecordEdit.aspx.cs">
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
       <DependentUpon>ConcealedWorksInspectionRecordEdit.aspx</DependentUpon>
     </Compile>
     <Compile Include="JGZL\ConcealedWorksInspectionRecordEdit.aspx.designer.cs">

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx

@@ -208,6 +208,9 @@
         <f:MenuButton ID="btnMenuExtend" OnClick="btnMenuExtend_Click" EnablePostBack="true"
             runat="server" Text="扩拍" Icon="TableEdit">
         </f:MenuButton>
+        <f:MenuButton ID="btnIncision" OnClick="btnIncision_Click" EnablePostBack="true"
+            runat="server" Text="割口" Icon="CdrCross">
+        </f:MenuButton>
     </f:Menu>
     </form>
     <script type="text/javascript">

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.cs

@@ -726,5 +726,30 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             this.InitTreeMenu();
         }
+
+        /// <summary>
+        /// 割口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnIncision_Click(object sender, EventArgs e)
+        {
+            string repairItemRecordId = Grid1.DataKeys[Grid1.SelectedRowIndex][0].ToString();
+            var r = BLL.HJGL_CH_RepairItemRecordService.GetRepairItemRecordById(repairItemRecordId);
+            if (r != null)
+            {
+                if (r.RepairMark != "CE")
+                {
+                    r.RepairMark = "CE";
+                    Funs.DB.SubmitChanges();
+                    ShowNotify("割口成功", MessageBoxIcon.Success);
+                    BindGrid();
+                }
+                else
+                {
+                    ShowNotify("已是割口，无需重复割口！");
+                }
+            }
+        }
     }
 }

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.WeldingManage {
+namespace FineUIPro.Web.HJGL.WeldingManage
+{
 
 
-    public partial class RepairItemRecordTrust {
+    public partial class RepairItemRecordTrust
+    {
 
         /// <summary>
         /// form1 控件。
@@ -263,5 +265,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuExtend;
+
+        /// <summary>
+        /// btnIncision 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnIncision;
     }
 }

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

@@ -22,6 +22,10 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                 this.drpProjectId.DataSource = BLL.Base_ProjectService.GetProjectListByUserId(this.CurrUser.UserId, "1");
                 this.drpProjectId.DataBind();
                 Funs.FineUIPleaseSelect(drpProjectId);
+                if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+                {
+                    this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
+                }
 
                 this.drpJointType.DataTextField = "Text";
                 this.drpJointType.DataValueField = "Value";
@@ -35,7 +39,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                 this.drpIsoId.DataBind();
 
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                this.txtEndDate.Text = DateTime.Now.ToShortDateString();
+                //this.txtEndDate.Text = DateTime.Now.ToShortDateString();
 
                 // 绑定表格
                 BindGrid();
@@ -47,41 +51,48 @@ namespace FineUIPro.Web.HJGL.WeldingReport
         /// </summary>
         private void BindGrid()
         {
-            //string strSql = @" SELECT v.ProjectId,project.ProjectCode,project.ProjectName,v.JOTY_Group,
+            string strSql = @" select distinct batch.ProjectId,
-            //                          (CASE WHEN v.JOTY_Group='1' THEN '对接焊缝' WHEN v.JOTY_Group='2' THEN '角焊缝' 
+                                    Project.ProjectCode,
-            //                                WHEN v.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
+                                    Project.ProjectName,
-            //                         v.VICheckDate,v.NDTR_ID,rate.NDTR_Name
+                                    weldReport.JOT_WeldDate,
-            //                    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
+                                    WHEN jointType.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
-                        from HJGL_BO_BatchDetail as batchDetail
+                                    jointType.JOTY_Group,
-                        left join HJGL_BO_Batch as batch on batch.BatchId = batchDetail.BatchId
+                                    rate.NDTR_ID,
-                        left join HJGL_PW_JointInfo as jointInfo on jointInfo.JOT_ID = batchDetail.JOT_ID
+                                    rate.NDTR_Name,
-                        left join HJGL_PW_IsoInfo as isoInfo on isoInfo.ISO_ID= jointInfo.ISO_ID
+                                    isoInfo.ISO_ID,
-                        left join HJGL_BS_JointType as jointType on jointType.JOTY_ID= jointInfo.JOTY_ID
+                                    isoInfo.ISO_IsoNo,
-                        left join Base_Project as project on project.ProjectId = batch.ProjectId
+                                    batch.BatchCode,
-                        LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where BatchDetail.VICheckDate IS NOT NULL ";
+                                    batchDetail.VICheckDate
+                                    from HJGL_BO_BatchDetail batchDetail
+                            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 HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=joint.ISO_ID
+                            LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId
+                            left join HJGL_BO_WeldReportMain weldReport on weldReport.DReportID = joint.DReportID
+                            LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = batch.JOTY_ID
+                            LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where batch.ProjectId=@ProjectId and joint.DReportID IS NOT NULL ";
+            //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 jointInfo.DReportID IS NOT NULL ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null")
             {
@@ -113,7 +124,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
             Grid1.RecordCount = tb.Rows.Count;
-            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
             var table = this.GetPagedDataTable(Grid1, tb);
 
             Grid1.DataSource = table;

HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx

@@ -56,7 +56,7 @@
                     <Items>
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管道对接焊接接头报检/检查记录" EnableCollapse="true"
                             runat="server" BoxFlex="1" DataKeyNames="JOT_ID,New_ID" AllowCellEditing="true" EnableColumnLines="true"
-                            ClicksToEdit="2" DataIDField="New_ID" AllowSorting="true" SortField="JOT_WeldDate,ISO_IsoNo,JOT_JointNo"
+                            ClicksToEdit="2" DataIDField="New_ID" AllowSorting="true" SortField="ISO_IsoNo,Sort1,Sort2,Sort3,Sort4,Sort5"
                             SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
                             PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
                             <Columns>

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=.\SQL2022;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/;"/>

HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx

@@ -132,6 +132,11 @@
                             </Items>
                         </f:Panel>
                         <f:Panel ID="Panel8" BoxFlex="1" runat="server" ShowBorder="true" ShowHeader="true" Title="焊口返修超期未处理预警" AutoScroll="true">
+                            <Items>
+                                <f:TabStrip ID="TabStrip1" ShowBorder="true" TabPosition="Top"
+            EnableTabCloseMenu="false" ActiveTabIndex="0" runat="server" Height="285">
+            <Tabs>
+                <f:Tab Title="焊口返修超期未焊接" BodyPadding="0px" Layout="Fit" runat="server">
                     <Items>                       
                        <f:Grid ID="GridRepair" ShowBorder="false" ShowHeader="false" EnableCollapse="true"
     ShowGridHeader="true" runat="server" BoxFlex="0" DataKeyNames="RepairItemRecordId"
@@ -166,6 +171,17 @@
         </f:RenderField>
     </Columns>
 </f:Grid>  
+                    </Items>
+                </f:Tab>
+                <f:Tab Title="焊口返修超期未委托" BodyPadding="10px"
+                    runat="server">
+                    <Items>
+                    </Items>
+                </f:Tab>
+            </Tabs>
+        </f:TabStrip>
+
+
                             </Items>
                         </f:Panel>
                     </Items>

HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.cs

@@ -426,7 +426,7 @@ namespace FineUIPro.Web.common
             {
                 listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
             }
-            strSql += " AND DateDiff(d, repairItemRecord.FeedbackDate, GETDATE()) > 7  order by repairItemRecord.FeedbackDate asc";
+            strSql += " AND DateDiff(d, repairItemRecord.FeedbackDate, GETDATE()) > 3 and repairItemRecord.IsWeld is null order by repairItemRecord.FeedbackDate,repairItemRecord.FilmNum asc";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             this.GridRepair.DataSource = tb;

HJGL_DS/FineUIPro.Web/common/mainGdaz.aspx.designer.cs

@@ -248,6 +248,15 @@ namespace FineUIPro.Web.common
         /// </remarks>
         protected global::FineUIPro.Panel Panel8;
 
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
         /// <summary>
         /// GridRepair 控件。
         /// </summary>