diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index eac87757..14d066e1 100644
Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ
diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
index 64674e24..c0c7e3d1 100644
--- a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
+++ b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
+using Model;
namespace BLL
{
@@ -272,17 +273,24 @@ namespace BLL
db.SubmitChanges();
}
}
+
///
/// 获取已经验收的预制组件
///
- ///
+ ///
+ ///
+ ///
///
- public static List GetAcceptedPipelineComponent(string projectid)
+ public static List GetAcceptedPipelineComponent(string projectId, string pipelineCode,
+ string pipelineComponentCode,string flowingSection)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.HJGL_Pipeline_Component
join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId
- where y.ProjectId.Contains(projectid) && x.State.Equals(state_1)
+ where y.ProjectId.Contains(projectId) && x.State.Equals(state_1) &&
+ (string.IsNullOrEmpty(pipelineCode) || y.PipelineCode.Contains(pipelineCode)) &&
+ (string.IsNullOrEmpty(pipelineComponentCode) || x.PipelineComponentCode.Contains(pipelineComponentCode)) &&
+ (string.IsNullOrEmpty(flowingSection) || y.FlowingSection.Contains(flowingSection))
select x).ToList();
return q;
@@ -297,22 +305,23 @@ namespace BLL
return q;
}
- ///
- /// 管线下拉框
- ///
- /// 下拉框名字
- /// 是否显示请选择
- public static void InitPipelineDownList(FineUIPro.DropDownList dropName,string projectid, bool isShowPlease)
- {
- dropName.DataValueField = "PipelineComponentId";
- dropName.DataTextField = "PipelineComponentCode";
- dropName.DataSource = GetAcceptedPipelineComponent(projectid);
- dropName.DataBind();
- if (isShowPlease)
- {
- Funs.FineUIPleaseSelect(dropName);
- }
- }
+ /////
+ ///// 管线下拉框
+ /////
+ ///// 下拉框名字
+ ///// 是否显示请选择
+ //public static void InitPipelineDownList(FineUIPro.DropDownList dropName,string projectid, string pipelineCode,
+ // string pipelineComponentCode, bool isShowPlease)
+ //{
+ // dropName.DataValueField = "PipelineComponentId";
+ // dropName.DataTextField = "PipelineComponentCode";
+ // dropName.DataSource = GetAcceptedPipelineComponent(projectid, pipelineCode, pipelineComponentCode);
+ // dropName.DataBind();
+ // if (isShowPlease)
+ // {
+ // Funs.FineUIPleaseSelect(dropName);
+ // }
+ //}
public static void InitMainItemDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "Value";
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx b/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx
index 59c3cb35..65753ae2 100644
--- a/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx
+++ b/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -89,7 +89,7 @@ namespace FastReport
}
-
+
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index a2b4a81c..1fdb7299 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -10443,6 +10443,7 @@
EPSummaryReport.aspx
+ ASPXCodeBehind
EPSummaryReport.aspx
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx
index 366a9b74..1b52865d 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx
@@ -92,7 +92,7 @@
+ Width="900px" Height="500px">
-
+
@@ -16,10 +16,49 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%--
-
+ --%>
@@ -48,7 +87,7 @@
+ OnClick="btnSave_Click">
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs
index d22bcb4d..0d452303 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs
@@ -26,15 +26,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
if (!IsPostBack)
{
PackagingManageId = Request.Params["PackagingManageId"];
-
- HJGL_PipelineComponentService.InitPipelineDownList(drpPipelineComponentCode, this.CurrUser.LoginProjectId, false);
+ //HJGL_PipelineComponentService.InitPipelineDownList(drpPipelineComponentCode, this.CurrUser.LoginProjectId, false);
+ BindGrid();
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;
- drpPipelineComponentCode.SelectedValueArray = model.PipelineComponentId.Split(',');
+ dropPipelineComponentCode.Values = model.PipelineComponentId.Split(',');
txtStackingPosition.Text = model.StackingPosition;
txtContactName.Text = model.ContactName;
txtContactPhone.Text = model.ContactPhone;
@@ -51,26 +51,33 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
}
-
- protected void drpPipelineComponentCode_SelectedIndexChanged(object sender, EventArgs e)
+
+ private void BindGrid()
{
- if (!string .IsNullOrEmpty(drpPipelineComponentCode.SelectedValue))
- {
- var model_Component = BLL.HJGL_PipelineComponentService.GetPipelineComponentById(drpPipelineComponentCode.SelectedValue);
- var model_pipe=BLL.PipelineService.GetPipelineByPipelineId(model_Component.PipelineId);
- txtPlanStartDate.Text= model_Component.PlanStartDate.ToString();
- }
- else
- {
- txtPlanStartDate.Text =String.Empty;
-
- }
-
+ Grid1.DataSource = HJGL_PipelineComponentService.GetAcceptedPipelineComponent(CurrUser.LoginProjectId,
+ txtpipelineCode.Text.Trim(), txtpipelineComponentCode.Text.Trim(), txtflowingSection.Text.Trim());
+ Grid1 .DataBind();
}
+ //protected void drpPipelineComponentCode_SelectedIndexChanged(object sender, EventArgs e)
+ //{
+ // if (!string .IsNullOrEmpty(drpPipelineComponentCode.SelectedValue))
+ // {
+ // var model_Component = BLL.HJGL_PipelineComponentService.GetPipelineComponentById(drpPipelineComponentCode.SelectedValue);
+ // var model_pipe=BLL.PipelineService.GetPipelineByPipelineId(model_Component.PipelineId);
+ // txtPlanStartDate.Text= model_Component.PlanStartDate.ToString();
+ // }
+ // else
+ // {
+ // txtPlanStartDate.Text =String.Empty;
+
+ // }
+
+ //}
+
protected void btnSave_Click(object sender, EventArgs e)
{
- if (string.IsNullOrEmpty(drpPipelineComponentCode.SelectedValue))
+ if (dropPipelineComponentCode.Values.Length==0)
{
ShowNotify("请选择预制组件", MessageBoxIcon.Warning);
return;
@@ -82,7 +89,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
table.PackagingManageId = SQLHelper.GetNewID();
table.PackagingCode = txtPackagingCode.Text;
table.ProjectId = this.CurrUser.LoginProjectId;
- table.PipelineComponentId = string.Join(",", drpPipelineComponentCode.SelectedValueArray);
+ table.PipelineComponentId = string.Join(",", dropPipelineComponentCode.Values);
table.StackingPosition = txtStackingPosition.Text;
table.State = 0;
table.ContactName = txtContactName.Text;
@@ -96,7 +103,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
table.PackagingCode = txtPackagingCode.Text;
table.ProjectId = this.CurrUser.LoginProjectId;
- table.PipelineComponentId = string.Join(",", drpPipelineComponentCode.SelectedValueArray);
+ table.PipelineComponentId = string.Join(",", dropPipelineComponentCode.Values);
table.StackingPosition = txtStackingPosition.Text ;
table.State = 0;
table.ContactName = txtContactName.Text;
@@ -107,5 +114,10 @@ namespace FineUIPro.Web.HJGL.PreDesign
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
+
+ protected void btnFind_Click1(object sender, EventArgs e)
+ {
+ BindGrid();
+ }
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.designer.cs
index 1ee33084..51c6ea23 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.designer.cs
@@ -51,13 +51,67 @@ namespace FineUIPro.Web.HJGL.PreDesign
protected global::FineUIPro.DropDownList txtPackagingCode;
///
- /// drpPipelineComponentCode 控件。
+ /// dropPipelineComponentCode 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.DropDownList drpPipelineComponentCode;
+ protected global::FineUIPro.DropDownBox dropPipelineComponentCode;
+
+ ///
+ /// Grid1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid1;
+
+ ///
+ /// Label3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label Label3;
+
+ ///
+ /// txtpipelineCode 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtpipelineCode;
+
+ ///
+ /// txtpipelineComponentCode 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtpipelineComponentCode;
+
+ ///
+ /// txtflowingSection 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtflowingSection;
+
+ ///
+ /// btnFind 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnFind;
///
/// txtPlanStartDate 控件。