feat(HJGL): 新增材料仓库管理并优化管线划分页面

**新增功能：**
   - 添加材料仓库管理模块（增删改查）
   - 管线划分页面支持按流水段和管线划分筛选
   - 管线划分页面支持批量设置仓库

   **技术改进：**
   - 新增 Base_Warehouse 表和模型
   - 扩展 HJGL_Pipeline 模型添加 WarehouseId 字段
   - 优化管线查询支持多条件组合

SGGL/BLL/BLL.csproj

@@ -399,6 +399,7 @@
     <Compile Include="HJGL\BaseInfo\Base_PressureService.cs" />
     <Compile Include="HJGL\BaseInfo\Base_PurgeMethodService.cs" />
     <Compile Include="HJGL\BaseInfo\Base_TestMediumService.cs" />
+    <Compile Include="HJGL\BaseInfo\Base_WarehouseService.cs" />
     <Compile Include="HJGL\BaseInfo\Base_WeldingLocationServie.cs" />
     <Compile Include="HJGL\BaseInfo\Base_WeldingMethodService.cs" />
     <Compile Include="HJGL\BaseInfo\Base_WeldTypeService.cs" />

SGGL/BLL/Common/Const.cs

@@ -2821,6 +2821,11 @@ namespace BLL
         /// </summary>
         public const string HJGL_ComponentsMenuId = "8IDKGJE2-09B1-4607-BC6D-865CE48F0009";
 
+        /// <summary>
+        /// 材料仓库
+        /// </summary>
+        public const string HJGL_WarehouseMenuId = "2F027233-22EC-4063-A04F-FB9FE6A91588";
+
         /// <summary>
         /// 探伤类型
         /// </summary>

SGGL/BLL/HJGL/BaseInfo/Base_WarehouseService.cs

@@ -0,0 +1,109 @@
+namespace BLL
+{
+    using Model;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    public static class Base_WarehouseService
+    {
+        /// <summary>
+        /// 根据仓库ID获取仓库信息
+        /// </summary>
+        /// <param name="warehouseId">仓库ID</param>
+        /// <returns>仓库实体</returns>
+        public static Model.Base_Warehouse GetWarehouseByWarehouseId(string warehouseId)
+        {
+            return Funs.DB.Base_Warehouse.FirstOrDefault(e => e.WarehouseId == warehouseId);
+        }
+
+        /// <summary>
+        /// 新增仓库信息
+        /// </summary>
+        /// <param name="warehouse">仓库实体</param>
+        public static void AddWarehouse(Model.Base_Warehouse warehouse)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Base_Warehouse newWarehouse = new Base_Warehouse
+            {
+                WarehouseId = warehouse.WarehouseId,
+                WarehouseName = warehouse.WarehouseName,
+                Remark = warehouse.Remark,
+                ProjectId = warehouse.ProjectId,
+                CreateUserId = warehouse.CreateUserId,
+                CreateTime = warehouse.CreateTime,
+                ModifyUserId = warehouse.ModifyUserId,
+                ModifyTime = warehouse.ModifyTime,
+            };
+            db.Base_Warehouse.InsertOnSubmit(newWarehouse);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 更新仓库信息
+        /// </summary>
+        /// <param name="warehouse">仓库实体</param>
+        public static void UpdateWarehouse(Model.Base_Warehouse warehouse)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Base_Warehouse newWarehouse = db.Base_Warehouse.FirstOrDefault(e => e.WarehouseId == warehouse.WarehouseId);
+            if (newWarehouse != null)
+            {
+                newWarehouse.WarehouseName = warehouse.WarehouseName;
+                newWarehouse.Remark = warehouse.Remark;
+                newWarehouse.ProjectId = warehouse.ProjectId;
+                newWarehouse.ModifyUserId = warehouse.ModifyUserId;
+                newWarehouse.ModifyTime = warehouse.ModifyTime;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据仓库ID删除仓库信息
+        /// </summary>
+        /// <param name="warehouseId">仓库ID</param>
+        public static void DeleteWarehouseByWarehouseId(string warehouseId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Base_Warehouse delWarehouse = db.Base_Warehouse.FirstOrDefault(e => e.WarehouseId == warehouseId);
+            if (delWarehouse != null)
+            {
+                db.Base_Warehouse.DeleteOnSubmit(delWarehouse);
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 获取项目下所有仓库列表
+        /// </summary>
+        /// <param name="projectId">项目ID</param>
+        /// <returns>仓库列表</returns>
+        public static List<Model.Base_Warehouse> GetWarehouseList(string projectId)
+        {
+            var list = (from x in Funs.DB.Base_Warehouse
+                        where x.ProjectId == projectId
+                        orderby x.WarehouseName
+                        select x).ToList();
+
+            return list;
+        }
+
+        /// <summary>
+        /// 初始化仓库下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框控件</param>
+        /// <param name="projectId">项目ID</param>
+        /// <param name="isShowPlease">是否显示"请选择"</param>
+        /// <param name="itemText">"请选择"项的文本</param>
+        public static void InitWarehouseDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease, string itemText)
+        {
+            dropName.DataValueField = "WarehouseId";
+            dropName.DataTextField = "WarehouseName";
+            dropName.DataSource = GetWarehouseList(projectId);
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName, itemText);
+            }
+        }
+    }
+}

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -1520,6 +1520,9 @@
     <Content Include="HJGL\BaseInfo\TestMedium.aspx" />
     <Content Include="HJGL\BaseInfo\TestMediumEdit.aspx" />
     <Content Include="HJGL\BaseInfo\TestMediumView.aspx" />
+    <Content Include="HJGL\BaseInfo\Warehouse.aspx" />
+    <Content Include="HJGL\BaseInfo\WarehouseEdit.aspx" />
+    <Content Include="HJGL\BaseInfo\WarehouseView.aspx" />
     <Content Include="HJGL\BaseInfo\Weld.aspx" />
     <Content Include="HJGL\BaseInfo\WeldEdit.aspx" />
     <Content Include="HJGL\BaseInfo\WeldingLocation.aspx" />
@@ -10347,6 +10350,27 @@
     <Compile Include="HJGL\BaseInfo\TestMediumView.aspx.designer.cs">
       <DependentUpon>TestMediumView.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HJGL\BaseInfo\Warehouse.aspx.cs">
+      <DependentUpon>Warehouse.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\BaseInfo\Warehouse.aspx.designer.cs">
+      <DependentUpon>Warehouse.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\BaseInfo\WarehouseEdit.aspx.cs">
+      <DependentUpon>WarehouseEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\BaseInfo\WarehouseEdit.aspx.designer.cs">
+      <DependentUpon>WarehouseEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\BaseInfo\WarehouseView.aspx.cs">
+      <DependentUpon>WarehouseView.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\BaseInfo\WarehouseView.aspx.designer.cs">
+      <DependentUpon>WarehouseView.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HJGL\BaseInfo\Weld.aspx.cs">
       <DependentUpon>Weld.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/HJGL/BaseInfo/Warehouse.aspx

@@ -0,0 +1,99 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Warehouse.aspx.cs" Inherits="FineUIPro.Web.HJGL.BaseInfo.Warehouse" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>材料仓库</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="材料仓库" EnableCollapse="true"
+                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WarehouseId"
+                    AllowCellEditing="true" ClicksToEdit="2" DataIDField="WarehouseId" AllowSorting="true"
+                    SortField="WarehouseName" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
+                    IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtWarehouseName" runat="server" Label="仓库名称" EmptyText="输入查询条件"
+                                    Width="300px" LabelWidth="140px" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:TextBox ID="txtRemark" runat="server" Label="备注" EmptyText="输入查询条件"
+                                    Width="300px" LabelWidth="140px" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:Button ID="btnQuery" Text="查询" Icon="SystemSearch"
+                                    EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
+                                </f:Button>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="true"
+                                    runat="server" OnClick="btnNew_Click">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center"></f:RowNumberField>
+                        <f:RenderField Width="250px" ColumnID="WarehouseName" DataField="WarehouseName" FieldType="String"
+                            HeaderText="仓库名称" HeaderTextAlign="Center" TextAlign="Left" SortField="WarehouseName">
+                        </f:RenderField>
+                        <f:RenderField Width="350px" ColumnID="Remark" DataField="Remark" FieldType="String"
+                            HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
+                        </f:RenderField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="600px" Height="300px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="BulletEdit" EnablePostBack="true"
+                runat="server" Text="编辑">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server"
+                Text="删除">
+            </f:MenuButton>
+            <f:MenuButton ID="btnView" OnClick="btnView_Click" Icon="Find" EnablePostBack="true"
+                runat="server" Text="查看">
+            </f:MenuButton>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>

SGGL/FineUIPro.Web/HJGL/BaseInfo/Warehouse.aspx.cs

@@ -0,0 +1,274 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.HJGL.BaseInfo
+{
+    public partial class Warehouse : PageBase
+    {
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                this.BindGrid();
+            }
+        }
+
+        #region 绑定数据
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT WarehouseId,WarehouseName,Remark"
+                         + @" FROM dbo.Base_Warehouse WHERE 1=1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " AND ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            if (!string.IsNullOrEmpty(this.txtWarehouseName.Text.Trim()))
+            {
+                strSql += " AND WarehouseName LIKE @WarehouseName";
+                listStr.Add(new SqlParameter("@WarehouseName", "%" + this.txtWarehouseName.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(this.txtRemark.Text.Trim()))
+            {
+                strSql += " AND Remark LIKE @Remark";
+                listStr.Add(new SqlParameter("@Remark", "%" + this.txtRemark.Text.Trim() + "%"));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        /// <summary>
+        /// 改变索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页下拉选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 关闭弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+        #endregion
+
+        #region 增加按钮事件
+        /// <summary>
+        /// 增加按钮事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            if (GetButtonPower(Const.BtnAdd))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WarehouseEdit.aspx", "新增 - ")));
+            }
+            else
+            {
+                Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+        #endregion
+
+        #region 编辑
+        /// <summary>
+        /// 双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 右键编辑事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                return;
+            }
+
+            // 双击事件 编辑权限有：编辑页面，无：查看页面
+            if (GetButtonPower(Const.BtnModify))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WarehouseEdit.aspx?WarehouseId={0}", Grid1.SelectedRowID, "编辑 - ")));
+            }
+            else if (GetButtonPower(Const.BtnSee))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WarehouseView.aspx?WarehouseId={0}", Grid1.SelectedRowID, "查看 - ")));
+            }
+            else
+            {
+                Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 右键删除事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            if (GetButtonPower(Const.BtnDelete))
+            {
+                if (Grid1.SelectedRowIndexArray.Length > 0)
+                {
+                    string strShowNotify = string.Empty;
+                    foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                    {
+                        string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                        var getWarehouse = BLL.Base_WarehouseService.GetWarehouseByWarehouseId(rowID);
+                        if (getWarehouse != null)
+                        {
+                            string cont = judgementDelete(rowID);
+                            if (string.IsNullOrEmpty(cont))
+                            {
+                                BLL.Base_WarehouseService.DeleteWarehouseByWarehouseId(rowID);
+                            }
+                            else
+                            {
+                                strShowNotify += "材料仓库" + ":" + getWarehouse.WarehouseName + cont;
+                            }
+                        }
+                    }
+
+                    BindGrid();
+                    if (!string.IsNullOrEmpty(strShowNotify))
+                    {
+                        Alert.ShowInTop(strShowNotify, MessageBoxIcon.Warning);
+                    }
+                    else
+                    {
+                        ShowNotify("删除成功！", MessageBoxIcon.Success);
+                    }
+                }
+            }
+            else
+            {
+                Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+
+        #region 判断是否可删除
+        /// <summary>
+        /// 判断是否可以删除
+        /// </summary>
+        /// <returns></returns>
+        private string judgementDelete(string id)
+        {
+            string content = string.Empty;
+            // 检查是否有关联的管线
+            if (Funs.DB.HJGL_Pipeline.FirstOrDefault(x => x.WarehouseId == id) != null)
+            {
+                content += "已在【管线信息】中使用，不能删除！";
+            }
+
+            return content;
+        }
+        #endregion
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 查看按钮
+        /// <summary>
+        /// 查看按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnView_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WarehouseView.aspx?WarehouseId={0}", Grid1.SelectedRowID, "查看 - ")));
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private bool GetButtonPower(string button)
+        {
+            return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_WarehouseMenuId, button);
+        }
+        #endregion
+    }
+}

SGGL/FineUIPro.Web/HJGL/BaseInfo/Warehouse.aspx.designer.cs

@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.BaseInfo
+{
+
+
+    public partial class Warehouse
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtWarehouseName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWarehouseName;
+
+        /// <summary>
+        /// txtRemark 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRemark;
+
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+
+        /// <summary>
+        /// btnMenuDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+
+        /// <summary>
+        /// btnView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnView;
+    }
+}

SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseEdit.aspx

@@ -0,0 +1,46 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WarehouseEdit.aspx.cs"
+    Inherits="FineUIPro.Web.HJGL.BaseInfo.WarehouseEdit" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>编辑材料仓库</title>
+    <base target="_self" />
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+    <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+        <Rows>
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtWarehouseName" runat="server" Label="仓库名称"
+                        Required="true" MaxLength="200" ShowRedStar="true" LabelWidth="150px">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelWidth="150px">
+                    </f:TextArea>
+                </Items>
+            </f:FormRow>
+        </Rows>
+        <Toolbars>
+            <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                <Items>
+                    <f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
+                        OnClick="btnSave_Click" ToolTip="保存">
+                    </f:Button>
+                    <f:Button ID="btnClose" EnablePostBack="false" Text="关闭"
+                        runat="server" Icon="SystemClose">
+                    </f:Button>
+                </Items>
+            </f:Toolbar>
+        </Toolbars>
+    </f:Form>
+    </form>
+</body>
+</html>

SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseEdit.aspx.cs

@@ -0,0 +1,100 @@
+using BLL;
+using System;
+using System.Linq;
+
+namespace FineUIPro.Web.HJGL.BaseInfo
+{
+    public partial class WarehouseEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string WarehouseId
+        {
+            get
+            {
+                return (string)ViewState["WarehouseId"];
+            }
+            set
+            {
+                ViewState["WarehouseId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.txtWarehouseName.Focus();
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                this.WarehouseId = Request.Params["WarehouseId"];
+                if (!string.IsNullOrEmpty(this.WarehouseId))
+                {
+                    Model.Base_Warehouse warehouse = BLL.Base_WarehouseService.GetWarehouseByWarehouseId(this.WarehouseId);
+                    if (warehouse != null)
+                    {
+                        this.txtWarehouseName.Text = warehouse.WarehouseName;
+                        this.txtRemark.Text = warehouse.Remark;
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            // 唯一性检查：仓库名称在项目内不能重复
+            var q = Funs.DB.Base_Warehouse.FirstOrDefault(x => x.WarehouseName == this.txtWarehouseName.Text.Trim()
+                && (x.WarehouseId != this.WarehouseId || (this.WarehouseId == null && x.WarehouseId != null))
+                && x.ProjectId == this.CurrUser.LoginProjectId);
+            if (q != null)
+            {
+                Alert.ShowInTop("此仓库名称已存在！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            Model.Base_Warehouse newWarehouse = new Model.Base_Warehouse
+            {
+                WarehouseName = this.txtWarehouseName.Text.Trim(),
+                Remark = this.txtRemark.Text.Trim(),
+                ProjectId = this.CurrUser.LoginProjectId,
+                ModifyUserId = this.CurrUser.PersonId,
+                ModifyTime = DateTime.Now
+            };
+
+            if (!string.IsNullOrEmpty(this.WarehouseId))
+            {
+                // 更新
+                newWarehouse.WarehouseId = this.WarehouseId;
+                BLL.Base_WarehouseService.UpdateWarehouse(newWarehouse);
+            }
+            else
+            {
+                // 新增
+                this.WarehouseId = SQLHelper.GetNewID(typeof(Model.Base_Warehouse));
+                newWarehouse.WarehouseId = this.WarehouseId;
+                newWarehouse.CreateUserId = this.CurrUser.PersonId;
+                newWarehouse.CreateTime = DateTime.Now;
+                BLL.Base_WarehouseService.AddWarehouse(newWarehouse);
+            }
+
+            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+        #endregion
+    }
+}

SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseEdit.aspx.designer.cs

@@ -0,0 +1,87 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.BaseInfo {
+
+
+    public partial class WarehouseEdit {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// txtWarehouseName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWarehouseName;
+
+        /// <summary>
+        /// txtRemark 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+    }
+}

SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseView.aspx

@@ -0,0 +1,43 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WarehouseView.aspx.cs"
+    Inherits="FineUIPro.Web.HJGL.BaseInfo.WarehouseView" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>查看材料仓库</title>
+    <base target="_self" />
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtWarehouseName" runat="server" Label="仓库名称"
+                            MaxLength="200" LabelWidth="150px" Enabled="false">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelWidth="150px" Enabled="false">
+                        </f:TextArea>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:Button ID="btnClose" EnablePostBack="false" Text="关闭"
+                            runat="server" Icon="SystemClose">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+    </form>
+</body>
+</html>

SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseView.aspx.cs

@@ -0,0 +1,50 @@
+using BLL;
+using System;
+
+namespace FineUIPro.Web.HJGL.BaseInfo
+{
+    public partial class WarehouseView : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string WarehouseId
+        {
+            get
+            {
+                return (string)ViewState["WarehouseId"];
+            }
+            set
+            {
+                ViewState["WarehouseId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                this.WarehouseId = Request.Params["WarehouseId"];
+                if (!string.IsNullOrEmpty(this.WarehouseId))
+                {
+                    Model.Base_Warehouse warehouse = BLL.Base_WarehouseService.GetWarehouseByWarehouseId(this.WarehouseId);
+                    if (warehouse != null)
+                    {
+                        this.txtWarehouseName.Text = warehouse.WarehouseName;
+                        this.txtRemark.Text = warehouse.Remark;
+                    }
+                }
+            }
+        }
+        #endregion
+    }
+}

SGGL/FineUIPro.Web/HJGL/BaseInfo/WarehouseView.aspx.designer.cs

@@ -0,0 +1,78 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.BaseInfo {
+
+
+    public partial class WarehouseView {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// txtWarehouseName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWarehouseName;
+
+        /// <summary>
+        /// txtRemark 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+    }
+}

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

@@ -62,6 +62,11 @@
                                     <Items>
                                         <f:Label ID="lbSinglePreRate" CssClass="customlabel" runat="server" Label="图纸预制率" Hidden="True"></f:Label>
                                         <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:DropDownList ID="ddlWarehouse" runat="server" Label="仓库" Width="200px" LabelWidth="80px">
+                                        </f:DropDownList>
+                                        <f:Button ID="btnSetWarehouse" ToolTip="仓库设置" Text="仓库设置" Icon="ApplicationEdit"
+                                            EnablePostBack="true" OnClick="btnSetWarehouse_Click" runat="server">
+                                        </f:Button>
                                         <f:Button ID="btnSetShop" ToolTip="工厂预制" Text="工厂预制" Icon="ApplicationEdit"
                                             EnablePostBack="true" OnClick="btnSetShop_Click" runat="server">
                                         </f:Button>
@@ -83,11 +88,13 @@
                                             EmptyText="输入查询条件" Hidden="true"
                                             Width="180px" LabelWidth="80px" LabelAlign="Right">
                                         </f:TextBox>
-                                        
+
-                                        <f:TextBox ID="txtMaterialCode" runat="server" Label="材质"
+                                        <f:DropDownList ID="ddlFlowingSection" runat="server" Label="流水段"
-                                            EmptyText="输入查询条件"
                                             Width="180px" LabelWidth="80px" LabelAlign="Right">
-                                        </f:TextBox>
+                                        </f:DropDownList> 
+                                        <f:DropDownList ID="ddlPipeArea" runat="server" Label="管线划分"
+                                            Width="180px" LabelWidth="80px" LabelAlign="Right">
+                                        </f:DropDownList>
                                         <f:ToolbarFill runat="server"></f:ToolbarFill>
                                         <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
                                             EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
@@ -125,6 +132,14 @@
                                                 <asp:Label ID="txt" runat="server" Text='<%# ConvertPipeArea(Eval("PipeArea")) %>'></asp:Label>
                                             </ItemTemplate>
                                         </f:TemplateField>
+                                        <f:RenderField Width="150px" ColumnID="FlowingSection" DataField="FlowingSection"
+                                            FieldType="String" HeaderText="流水段" HeaderTextAlign="Center"
+                                            TextAlign="Center" SortField="FlowingSection">
+                                        </f:RenderField>
+                                        <f:RenderField Width="150px" ColumnID="WarehouseName" DataField="WarehouseName"
+                                            FieldType="String" HeaderText="仓库" HeaderTextAlign="Center"
+                                            TextAlign="Center" SortField="WarehouseName">
+                                        </f:RenderField>
                                     </Columns>
 
                                     <%--<PageItems>

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

@@ -53,6 +53,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
                 this.InitTreeMenu();//加载树
                 PipelineComplete = 0;
                 PipelineNOComplete = 0;
+
+                // 初始化仓库下拉框
+                Base_WarehouseService.InitWarehouseDropDownList(this.ddlWarehouse, this.CurrUser.LoginProjectId, true, "-请选择-");
+
+                // 初始化流水段下拉框
+                this.InitFlowingSectionDropDownList();
+
+                // 初始化管线划分下拉框
+                this.InitPipeAreaDropDownList();
             }
         }
 
@@ -150,6 +159,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// <param name="e"></param>
         protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
         {
+            InitFlowingSectionDropDownList();
             this.BindGrid();
             // var q = view_HJGL_Pipelines.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP);
             // if (q.Any())
@@ -190,13 +200,26 @@ namespace FineUIPro.Web.HJGL.PreDesign
             view_HJGL_Pipeline.SingleName = this.txtSingleName.Text.Trim();
             // view_HJGL_Pipeline.MaterialCode=this.txtMaterialCode.Text.Trim();
             var list = BLL.PipelineService.GetHJGL_PipelineList(view_HJGL_Pipeline);
-            if (!string.IsNullOrEmpty(this.txtMaterialCode.Text.Trim()))
+/*            if (!string.IsNullOrEmpty(this.txtMaterialCode.Text.Trim()))
             {
                 list = (from x in list
                         join y in Funs.DB.HJGL_PipeLineMat on x.PipelineId equals y.PipelineId
                         where y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
                         select x).Distinct().ToList();
+            }*/
+
+            // 流水段查询
+            if ( this.ddlFlowingSection.SelectedValue != Const._Null)
+            {
+                list = list.Where(x => x.FlowingSection == this.ddlFlowingSection.SelectedValue).ToList();
             }
+
+            // 管线划分查询
+            if (this.ddlPipeArea.SelectedValue!=Const._Null)
+            {
+                list = list.Where(x => x.PipeArea == this.ddlPipeArea.SelectedValue).ToList();
+            }
+
             view_HJGL_Pipelines = list;
             // 2.获取当前分页数据
             Grid1.RecordCount = list.Count();
@@ -205,8 +228,23 @@ namespace FineUIPro.Web.HJGL.PreDesign
 
             // 3.绑定到Grid
 
+            // 获取仓库名称
+            var warehouseList = Base_WarehouseService.GetWarehouseList(this.CurrUser.LoginProjectId);
+            var listWithWarehouse = (from x in list
+                                     join y in warehouseList on x.WarehouseId equals y.WarehouseId into temp
+                                     from z in temp.DefaultIfEmpty()
+                                     select new
+                                     {
+                                         x.PipelineId,
+                                         x.PipelineCode,
+                                         x.FlowingSection,
+                                         x.PipeArea,
+                                         x.UnitWorkId,
+                                         x.ProjectId,
+                                         WarehouseName = z != null ? z.WarehouseName : ""
+                                     }).ToList();
 
-            var table = this.GetPagedDataTable(Grid1, list);
+            var table = this.GetPagedDataTable(Grid1, listWithWarehouse);
             Grid1.DataSource = table;
             Grid1.DataBind();
             //lbSinglePreRate.Text= GetSinglePreRateByUnitWork(this.tvControlItem.SelectedNodeID);
@@ -364,11 +402,47 @@ namespace FineUIPro.Web.HJGL.PreDesign
             BindGrid();
         }
 
+        /// <summary>
+        /// 仓库设置按钮
+        /// </summary>
+        protected void btnSetWarehouse_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            string warehouseId = this.ddlWarehouse.SelectedValue;
+            if (string.IsNullOrEmpty(warehouseId))
+            {
+                Alert.ShowInTop("请选择仓库！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            // 批量更新
+            foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+            {
+                string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                var pipeline = PipelineService.GetPipelineByPipelineId(rowID);
+                if (pipeline != null)
+                {
+                    pipeline.WarehouseId = warehouseId;
+                    PipelineService.UpdatePipeline(pipeline);
+                }
+            }
+
+            BindGrid();
+            ShowNotify("批量设置仓库成功！", MessageBoxIcon.Success);
+        }
+
         protected void btnRset_Click(object sender, EventArgs e)
         {
             txtPipelineCode.Text = String.Empty;
             txtSingleName.Text = String.Empty;
-            txtMaterialCode.Text = String.Empty;
+            //txtMaterialCode.Text = String.Empty;
+            ddlFlowingSection.SelectedValue = Const._Null;
+            ddlPipeArea.SelectedValue = String.Empty;
             BindGrid();
         }
 
@@ -392,6 +466,49 @@ namespace FineUIPro.Web.HJGL.PreDesign
             }
             return PipeAreaValue;
         }
+
+        #region 初始化下拉框
+        /// <summary>
+        /// 初始化流水段下拉框
+        /// </summary>
+        private void InitFlowingSectionDropDownList()
+        {
+            var baseQuery = from x in Funs.DB.HJGL_Pipeline
+                            where x.ProjectId == this.CurrUser.LoginProjectId
+                            select new {
+                                x.FlowingSection ,
+                                x.UnitWorkId
+                            };
+            if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
+            {
+                baseQuery = baseQuery.Where(x => x.UnitWorkId == tvControlItem.SelectedNodeID);
+            }
+            var flowingSections = baseQuery.Select(x=>x.FlowingSection).Distinct().OrderBy(x => x).ToList();
+            this.ddlFlowingSection.DataValueField = "FlowingSection";
+            this.ddlFlowingSection.DataTextField = "FlowingSection";
+            this.ddlFlowingSection.DataSource = flowingSections.Select(x => new { FlowingSection = x }).ToList();
+            this.ddlFlowingSection.DataBind();
+            Funs.FineUIPleaseSelect(this.ddlFlowingSection, "-请选择-");
+        }
+
+        /// <summary>
+        /// 初始化管线划分下拉框
+        /// </summary>
+        private void InitPipeAreaDropDownList()
+        {
+            List<System.Web.UI.WebControls.ListItem> pipeAreaList = new List<System.Web.UI.WebControls.ListItem>(); 
+            pipeAreaList.Add(new System.Web.UI.WebControls.ListItem("工厂预制", PipelineService.PipeArea_SHOP));
+            pipeAreaList.Add(new System.Web.UI.WebControls.ListItem("现场施工", PipelineService.PipeArea_FIELD));
+
+            this.ddlPipeArea.DataValueField = "Value";
+            this.ddlPipeArea.DataTextField = "Text";
+            this.ddlPipeArea.DataSource = pipeAreaList;
+            this.ddlPipeArea.DataBind();
+            Funs.FineUIPleaseSelect(this.ddlPipeArea, "-请选择-");
+
+        }
+        #endregion
+
         /// <summary>
         /// 获取图纸预制率（工厂预制管线的预制达因/工厂预制管线的总达因）
         /// </summary>

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

@@ -140,6 +140,24 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </remarks>
         protected global::FineUIPro.Label lbSinglePreRate;
 
+        /// <summary>
+        /// ddlWarehouse 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlWarehouse;
+
+        /// <summary>
+        /// btnSetWarehouse 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSetWarehouse;
+
         /// <summary>
         /// btnSetShop 控件。
         /// </summary>
@@ -195,13 +213,22 @@ namespace FineUIPro.Web.HJGL.PreDesign
         protected global::FineUIPro.TextBox txtSingleName;
 
         /// <summary>
-        /// txtMaterialCode 控件。
+        /// ddlFlowingSection 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtMaterialCode;
+        protected global::FineUIPro.DropDownList ddlFlowingSection;
+
+        /// <summary>
+        /// ddlPipeArea 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPipeArea;
 
         /// <summary>
         /// btnQuery 控件。

SGGL/FineUIPro.Web/common/Menu_HJGL.xml

@@ -4,6 +4,7 @@
     <TreeNode id="8IDKGJE2-09B1-1234-VC6D-865CE48F0005" Text="管道等级" NavigateUrl="HJGL/BaseInfo/PipingClass.aspx">
     </TreeNode>
 <TreeNode id="8IDKGJE2-09B1-4607-BC6D-865CE48F0014" Text="管道介质" NavigateUrl="HJGL/BaseInfo/Medium.aspx"></TreeNode>
+<TreeNode id="2F027233-22EC-4063-A04F-FB9FE6A91588" Text="材料仓库" NavigateUrl="HJGL/BaseInfo/Warehouse.aspx"></TreeNode>
 <TreeNode id="F6194C00-D256-485D-9056-171FAB75928A" Text="管道颜色标识库" NavigateUrl="HJGL/BaseInfo/MaterialColor.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="8IDKGJE2-09B1-4607-DCS2-DCC3O48F080F" Text="数据导入" NavigateUrl=""><TreeNode id="B13BFFA5-3112-4209-8562-5329B78B405C" Text="三维模型导入" NavigateUrl="HJGL/DataImport/TDMImport.aspx"></TreeNode>
@@ -13,12 +14,12 @@
 <TreeNode id="1EE36752-6077-47C9-AFF0-5372B862FF61" Text="管线划分" NavigateUrl="HJGL/PreDesign/PipelingDivide.aspx"></TreeNode>
 <TreeNode id="EF6B01AF-D038-4A38-BFAF-D89130D60DE6" Text="材料信息导入" NavigateUrl="HJGL/DataImport/MaterialInformation.aspx"></TreeNode>
 <TreeNode id="1E36EA73-D536-4215-BFB9-A8771937BD89" Text="工厂预制管理" NavigateUrl=""><TreeNode id="0A3F6AB0-535E-489C-9F64-4FFE61C17085" Text="材料管理" NavigateUrl="HJGL/PreDesign/MaterialManage.aspx"></TreeNode>
+<TreeNode id="53948077-B51D-4FF3-BFB0-AB4E27C42875" Text="排产计划" NavigateUrl="HJGL/PreDesign/ProductionSchedulingPlan.aspx"></TreeNode>
 <TreeNode id="8255554C-0A92-4C7B-BF19-779AF0220A8C" Text="预制组件管理" NavigateUrl="HJGL/PreDesign/PrePipeline.aspx"></TreeNode>
 <TreeNode id="F18CFC0E-47E0-477A-9AB3-72B88D438299" Text="堆场规划" NavigateUrl="HJGL/PreDesign/YardPlanning.aspx"></TreeNode>
-<TreeNode id="EEC0D060-C15E-4D25-B015-C2B91F735DAC" Text="车次管理" NavigateUrl="HJGL/PreDesign/TrainNumberManager.aspx"></TreeNode>
-<TreeNode id="25DED954-10C9-47CC-99F2-C44FDE9E0A81" Text="发货管理" NavigateUrl="HJGL/PreDesign/PackagingManage.aspx"></TreeNode>
 <TreeNode id="BD9C587E-17C2-49F1-82AE-A05117E41D89" Text="安装清单" NavigateUrl="HJGL/PreDesign/InstallList.aspx"></TreeNode>
-<TreeNode id="53948077-B51D-4FF3-BFB0-AB4E27C42875" Text="排产计划" NavigateUrl="HJGL/PreDesign/ProductionSchedulingPlan.aspx"></TreeNode>
+<TreeNode id="EEC0D060-C15E-4D25-B015-C2B91F735DAC" Text="发货管理" NavigateUrl="HJGL/PreDesign/TrainNumberManager.aspx"></TreeNode>
+<TreeNode id="25DED954-10C9-47CC-99F2-C44FDE9E0A81" Text="包装管理" NavigateUrl="HJGL/PreDesign/PackagingManage.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="9B828E92-733B-4AF9-9DD0-55ECD8B64AB8" Text="材料管理" NavigateUrl=""><TreeNode id="E29C1839-3530-45EC-A752-B26A0027E2CD" Text="入库管理" NavigateUrl=""><TreeNode id="324C72AF-447A-4308-AFB7-ABF788C58240" Text="入库申请" NavigateUrl="CLGL/InPlanMaster.aspx"></TreeNode>
 <TreeNode id="4A55351A-2440-4A2D-8509-3FFEE5FC8861" Text="入库单管理" NavigateUrl="CLGL/InputMaster.aspx"></TreeNode>
@@ -27,7 +28,7 @@
 <TreeNode id="BCCA4D81-410C-4746-B1E4-F882BC3A25F4" Text="出库单管理" NavigateUrl="CLGL/OutputMaster.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="9579C717-769E-4CC0-9E54-EE03D87C15A5" Text="库存管理" NavigateUrl=""><TreeNode id="803F9828-52FA-4EF7-99C7-ADA99DADE9FB" Text="库存管理" NavigateUrl="CLGL/MaterialStock.aspx"></TreeNode>
-<TreeNode id="D15E534F-98F3-4B8A-8656-EAF165DE917F" Text="盘点" NavigateUrl="CLGL/MaterialStock.aspx"></TreeNode>
+<TreeNode id="D15E534F-98F3-4B8A-8656-EAF165DE917F" Text="盘点" NavigateUrl="CLGL/InputMaster.aspx"></TreeNode>
 <TreeNode id="C05EF3BE-AB13-4852-B2AA-1095BE4EEB2F" Text="到货分析" NavigateUrl="CLGL/ArrivalStatistics.aspx"></TreeNode>
 </TreeNode>
 </TreeNode>

SGGL/Model/Model.cs

@@ -266,6 +266,9 @@ namespace Model
     partial void InsertBase_UnitType(Base_UnitType instance);
     partial void UpdateBase_UnitType(Base_UnitType instance);
     partial void DeleteBase_UnitType(Base_UnitType instance);
+    partial void InsertBase_Warehouse(Base_Warehouse instance);
+    partial void UpdateBase_Warehouse(Base_Warehouse instance);
+    partial void DeleteBase_Warehouse(Base_Warehouse instance);
     partial void InsertBase_WeldingLocation(Base_WeldingLocation instance);
     partial void UpdateBase_WeldingLocation(Base_WeldingLocation instance);
     partial void DeleteBase_WeldingLocation(Base_WeldingLocation instance);
@@ -2571,6 +2574,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Base_Warehouse> Base_Warehouse
+		{
+			get
+			{
+				return this.GetTable<Base_Warehouse>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Base_WeldingLocation> Base_WeldingLocation
 		{
 			get
@@ -38761,6 +38772,236 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_Warehouse")]
+	public partial class Base_Warehouse : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _WarehouseId;
+		
+		private string _WarehouseName;
+		
+		private string _Remark;
+		
+		private string _ProjectId;
+		
+		private string _CreateUserId;
+		
+		private System.Nullable<System.DateTime> _CreateTime;
+		
+		private string _ModifyUserId;
+		
+		private System.Nullable<System.DateTime> _ModifyTime;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnWarehouseIdChanging(string value);
+    partial void OnWarehouseIdChanged();
+    partial void OnWarehouseNameChanging(string value);
+    partial void OnWarehouseNameChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnCreateUserIdChanging(string value);
+    partial void OnCreateUserIdChanged();
+    partial void OnCreateTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCreateTimeChanged();
+    partial void OnModifyUserIdChanging(string value);
+    partial void OnModifyUserIdChanged();
+    partial void OnModifyTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnModifyTimeChanged();
+    #endregion
+		
+		public Base_Warehouse()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string WarehouseId
+		{
+			get
+			{
+				return this._WarehouseId;
+			}
+			set
+			{
+				if ((this._WarehouseId != value))
+				{
+					this.OnWarehouseIdChanging(value);
+					this.SendPropertyChanging();
+					this._WarehouseId = value;
+					this.SendPropertyChanged("WarehouseId");
+					this.OnWarehouseIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseName", DbType="NVarChar(200) NOT NULL", CanBeNull=false)]
+		public string WarehouseName
+		{
+			get
+			{
+				return this._WarehouseName;
+			}
+			set
+			{
+				if ((this._WarehouseName != value))
+				{
+					this.OnWarehouseNameChanging(value);
+					this.SendPropertyChanging();
+					this._WarehouseName = value;
+					this.SendPropertyChanged("WarehouseName");
+					this.OnWarehouseNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
+		public string Remark
+		{
+			get
+			{
+				return this._Remark;
+			}
+			set
+			{
+				if ((this._Remark != value))
+				{
+					this.OnRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._Remark = value;
+					this.SendPropertyChanged("Remark");
+					this.OnRemarkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateUserId", DbType="NVarChar(50)")]
+		public string CreateUserId
+		{
+			get
+			{
+				return this._CreateUserId;
+			}
+			set
+			{
+				if ((this._CreateUserId != value))
+				{
+					this.OnCreateUserIdChanging(value);
+					this.SendPropertyChanging();
+					this._CreateUserId = value;
+					this.SendPropertyChanged("CreateUserId");
+					this.OnCreateUserIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CreateTime
+		{
+			get
+			{
+				return this._CreateTime;
+			}
+			set
+			{
+				if ((this._CreateTime != value))
+				{
+					this.OnCreateTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CreateTime = value;
+					this.SendPropertyChanged("CreateTime");
+					this.OnCreateTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ModifyUserId", DbType="NVarChar(50)")]
+		public string ModifyUserId
+		{
+			get
+			{
+				return this._ModifyUserId;
+			}
+			set
+			{
+				if ((this._ModifyUserId != value))
+				{
+					this.OnModifyUserIdChanging(value);
+					this.SendPropertyChanging();
+					this._ModifyUserId = value;
+					this.SendPropertyChanged("ModifyUserId");
+					this.OnModifyUserIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ModifyTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ModifyTime
+		{
+			get
+			{
+				return this._ModifyTime;
+			}
+			set
+			{
+				if ((this._ModifyTime != value))
+				{
+					this.OnModifyTimeChanging(value);
+					this.SendPropertyChanging();
+					this._ModifyTime = value;
+					this.SendPropertyChanged("ModifyTime");
+					this.OnModifyTimeChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_WeldingLocation")]
 	public partial class Base_WeldingLocation : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -102234,6 +102475,8 @@ namespace Model
 		
 		private string _FlowingSection;
 		
+		private string _WarehouseId;
+		
 		private EntityRef<Base_TestMedium> _Base_TestMedium;
 		
 		private EntitySet<HJGL_Batch_PointBatch> _HJGL_Batch_PointBatch;
@@ -102338,6 +102581,8 @@ namespace Model
     partial void OnStateChanged();
     partial void OnFlowingSectionChanging(string value);
     partial void OnFlowingSectionChanged();
+    partial void OnWarehouseIdChanging(string value);
+    partial void OnWarehouseIdChanged();
     #endregion
 		
 		public HJGL_Pipeline()
@@ -103054,6 +103299,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WarehouseId", DbType="NVarChar(50)")]
+		public string WarehouseId
+		{
+			get
+			{
+				return this._WarehouseId;
+			}
+			set
+			{
+				if ((this._WarehouseId != value))
+				{
+					this.OnWarehouseIdChanging(value);
+					this.SendPropertyChanging();
+					this._WarehouseId = value;
+					this.SendPropertyChanged("WarehouseId");
+					this.OnWarehouseIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_[HJGL_Pipeline_Base_TestMedium1", Storage="_Base_TestMedium", ThisKey="LeakMedium", OtherKey="TestMediumId", IsForeignKey=true)]
 		public Base_TestMedium Base_TestMedium
 		{