组件打印更新

SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs

@@ -116,6 +116,10 @@ namespace BLL
         {
             string PlanStartDate = "";
             DataTable tb = BLL.HJGL_PackagingmanageService.GetPackagingDetailById(PackagingManageId);
+            if (tb == null || tb.Rows.Count == 0)
+            {
+                return PlanStartDate;
+            }
             var dtTable = tb.AsEnumerable().OrderBy(o => o["PlanStartDate"]).CopyToDataTable();
             if (dtTable.Rows != null && dtTable.Rows.Count > 0)
             {

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

@@ -78,11 +78,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
 
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            if (dropPipelineComponentCode.Values.Length==0)
+            /*if (dropPipelineComponentCode.Values.Length==0)
             {
                 ShowNotify("请选择预制组件", MessageBoxIcon.Warning);
                 return;
-            }
+            }*/
             if (string.IsNullOrEmpty(PackagingManageId))
             {
                 Model.HJGL_PackagingManage table = new Model.HJGL_PackagingManage() ;

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

@@ -61,6 +61,10 @@
                                 <f:DropDownList ID="drpWeldingDailyCode" Label="日报编号" runat="server" AutoSelectFirstItem="true"
                                     ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="100px">
                                 </f:DropDownList>
+                                <f:DropDownList ID="drpFlowingSection" Label="流水段" AutoPostBack="true"
+                runat="server"    LabelWidth="80px" 
+                Width="180px" LabelAlign="Left">
+</f:DropDownList>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
                                 <f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">

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

@@ -27,7 +27,14 @@ namespace FineUIPro.Web.HJGL.PreDesign
                 HJGL_PipelineComponentService.InitMainItemDownList(drpState,true);
                 HJGL_PipelineComponentService.InitMainItemDownProductionStateList(drpProductionState,true);
 
-
+                var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                                where x.ProjectId == this.CurrUser.LoginProjectId 
+                                select x.FlowingSection).Distinct().ToList();
+                this.drpFlowingSection.DataTextField = "Value";
+                this.drpFlowingSection.DataValueField = "Value";
+                this.drpFlowingSection.DataSource = pipeline;
+                this.drpFlowingSection.DataBind();
+                Funs.FineUIPleaseSelect(drpFlowingSection);
             }
         }
 
@@ -285,6 +292,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
                 listStr.Add(new SqlParameter("@ProductionState", drpProductionState.SelectedValue.ToString()));
 
             }
+            if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.SelectedValue != Const._Null)
+            {
+                strSql += " AND pipe.FlowingSection =@FlowingSection";
+                listStr.Add(new SqlParameter("@FlowingSection", drpFlowingSection.SelectedValue.ToString()));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             GridDataTable = tb;

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

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