20220923 焊接终版测试修改

SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs

@@ -17,6 +17,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
             {
                 this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                 this.InitTreeMenu();//加载树
+                HJGL_PipelineComponentService.InitMainItemDownList(drpState,true);
+
+
             }
         }
 
@@ -158,17 +161,30 @@ namespace FineUIPro.Web.HJGL.PreDesign
         {
             string strSql = @"	SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,
                                      com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,
-									 com.QRCode,com.State,pipe.PlanStartDate
+									 com.QRCode,com.State,pipe.PlanStartDate,com.DrawingName
                               FROM HJGL_Pipeline_Component com 
 							  LEFT JOIN HJGL_Pipeline pipe  ON pipe.PipelineId =com.PipelineId
 							  LEFT JOIN dbo.Base_Unit punit ON punit.UnitId=com.PreUnit
 							  LEFT JOIN dbo.Base_Unit aunit ON aunit.UnitId=com.AssembleUnit
-							  WHERE 1= 1";
+							  WHERE  com.PipelineId =@PipelineId ";
             List<SqlParameter> listStr = new List<SqlParameter> { };
 
-            strSql += " AND com.PipelineId =@PipelineId";
+            // strSql += " AND com.PipelineId =@PipelineId";
             listStr.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID));
 
+            if (!string.IsNullOrEmpty(txtPipelineComponentCode.Text))
+            {
+                strSql += " AND com.PipelineComponentCode like  @PipelineComponentCode";
+                listStr.Add(new SqlParameter("@PipelineComponentCode", "%" + this.txtPipelineComponentCode.Text.Trim() + "%"));
+
+            }
+            if (drpState.SelectedValue!=Const._Null)
+            {
+                strSql += " AND com.State =@State";
+                listStr.Add(new SqlParameter("@State", drpState.SelectedValue));
+
+            }
+
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -390,6 +406,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
         }
         #endregion
 
+        /// <summary>
+        /// 搜索
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
         public string ConvertImageUrlByImage(object str, object id)
         {
             string path = string.Empty;
@@ -423,5 +448,32 @@ namespace FineUIPro.Web.HJGL.PreDesign
             PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("PrePipelineQRCodeIn.aspx?", "导入 - ")));
 
         }
+        protected void btnSinglePreview_Click(object sender, EventArgs e)
+        {
+            //string httpUrl = @"FileUpload\HJGL_DataImport\095e9691-99c2-4f70-8e67-e70c8fa6be9c\2022-06\管道焊接工作记录.pdf";
+            //var newurl = Funs.SGGLUrl + httpUrl.Replace(Funs.RootPath, "");
+            var id = Grid1.SelectedRowID;
+            if (string.IsNullOrEmpty(id))
+            {
+                ShowNotify("请选择相对应的图纸", MessageBoxIcon.Warning);
+                return;
+            }
+            var SingleName = (from x in Funs.DB.HJGL_Pipeline_Component where x.PipelineComponentId == id select (x.DrawingName)).FirstOrDefault();
+            var filemodel = BLL.HJGL_DataImportService.GetLatestFileByFileName(SingleName, this.CurrUser.LoginProjectId);
+            if (filemodel != null)
+            {
+                string httpUrl = filemodel.FilePath;
+                PageContext.RegisterStartupScript(Window4.GetShowReference(String.Format("~/AttachFile/Look.aspx?fileUrl={0}", httpUrl, "查看  -")));
+
+            }
+            else
+            {
+                ShowNotify("请上传相关图纸", MessageBoxIcon.Warning);
+                return;
+            }
+
+
+        }
+
     }
 }