提交代码

SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs

@@ -139,10 +139,10 @@ namespace BLL
                 result = result.Where(x => PipelineId.Contains(x.PipelineId.ToString())).ToList();
             }
 
-            if (IsCheckPrint != null & IsCheckPrint ==true)
+            //if (IsCheckPrint != null & IsCheckPrint ==true)
-            {
+            //{
-                result = result.Where(x =>  x.IsPrint==false||x.IsPrint==null).ToList();
+            //    result = result.Where(x =>  x.IsPrint==false||x.IsPrint==null).ToList();
-            }
+            //}
             return result;
         }
 

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

@@ -14,8 +14,11 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList runat="server" ID="txtPackagingCode" EnableEdit="true" ForceSelection="false" Label="包装编号" LabelWidth="140px" LabelAlign="Right">
+                        <%--<f:DropDownList runat="server" ID="txtPackagingCode" EnableEdit="true" ForceSelection="false" Label="包装编号" LabelWidth="140px" LabelAlign="Right">
-                        </f:DropDownList>
+                        </f:DropDownList>--%>
+                        <f:TextBox ID="txtPackagingCode" runat="server" Label="包装编号" LabelAlign="Right" 
+                                                           LabelWidth="140px">
+                                                </f:TextBox> 
                         <f:DropDownBox runat="server" ID="dropPipelineComponentCode" EmptyText="请从下拉表格中选择" EnableMultiSelect="true" MatchFieldWidth="false">
                             <PopPanel>
                                 <f:Grid ID="Grid1" Width="650px" Height="400px" Hidden="true"
@@ -41,7 +44,7 @@
                                                 <f:TextBox ID="txtpipelineCode" runat="server" Label="管线编号" LabelAlign="Right" EmptyText="主项号+区域编号"
                                                            LabelWidth="180px">
                                                 </f:TextBox>
-                                                <f:TextBox ID="txtpipelineComponentCode" runat="server" Label=预制组件编号 LabelAlign="Right" 
+                                                <f:TextBox ID="txtpipelineComponentCode" runat="server" Label="预制组件编号" LabelAlign="Right" 
                                                            LabelWidth="180px">
                                                 </f:TextBox> 
                                                 <f:TextBox ID="txtflowingSection" runat="server" Label="流水段" LabelAlign="Right" 

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

@@ -28,12 +28,12 @@ namespace FineUIPro.Web.HJGL.PreDesign
                 PackagingManageId = Request.Params["PackagingManageId"];
                 //HJGL_PipelineComponentService.InitPipelineDownList(drpPipelineComponentCode, this.CurrUser.LoginProjectId, false);
                 BindGrid();
-                HJGL_PackagingmanageService.InitPipelineDownList(txtPackagingCode, this.CurrUser.LoginProjectId, false);
+                //HJGL_PackagingmanageService.InitPipelineDownList(txtPackagingCode, this.CurrUser.LoginProjectId, false);
                 btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 if (!string.IsNullOrEmpty(PackagingManageId))
                 {
                     var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
-                    txtPackagingCode.SelectedValue = model.PackagingCode;
+                    txtPackagingCode.Text = model.PackagingCode;
                     dropPipelineComponentCode.Values = model.PipelineComponentId.Split(',');
                     txtStackingPosition.Text = model.StackingPosition;
                     txtContactName.Text = model.ContactName;

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

@@ -7,12 +7,10 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.PreDesign
+namespace FineUIPro.Web.HJGL.PreDesign {
-{
     
     
-    public partial class PackagingManageEdit
+    public partial class PackagingManageEdit {
-    {
         
         /// <summary>
         /// form1 控件。
@@ -48,7 +46,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList txtPackagingCode;
+        protected global::FineUIPro.TextBox txtPackagingCode;
         
         /// <summary>
         /// dropPipelineComponentCode 控件。