From 01767541504412440d887db118e8eb91b156131b Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Sun, 28 Sep 2025 10:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=9C=E8=89=B2=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/SGGL_SeDin_New/v17/.wsuo                  | Bin 74752 -> 74240 bytes
 .../v17/DocumentLayout.backup.json            |   4 -
 .vs/SGGL_SeDin_New/v17/DocumentLayout.json    |   4 +
 .../BaseInfo/Base_MaterialColorService.cs     |  37 +++++-
 .../HJGL/BaseInfo/MaterialColor.aspx          |  10 +-
 .../HJGL/BaseInfo/MaterialColor.aspx.cs       |   7 +-
 .../HJGL/BaseInfo/MaterialColorEdit.aspx      | 106 +++++++++++-------
 .../HJGL/BaseInfo/MaterialColorEdit.aspx.cs   |  90 +++++++++++++--
 .../MaterialColorEdit.aspx.designer.cs        |  44 +++++++-
 SGGL/FineUIPro.Web/common/Menu_HJGL.xml       |   6 +-
 SGGL/Model/HJGL/BaseMaterialcolorOutput.cs    |  21 ++++
 SGGL/Model/Model.cs                           |  24 ++++
 SGGL/Model/Model.csproj                       |   1 +
 13 files changed, 279 insertions(+), 75 deletions(-)
 create mode 100644 SGGL/Model/HJGL/BaseMaterialcolorOutput.cs

diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo
index f326ce86d5985a094d0bed8a3d678d1bf00cb17b..87c5769b3caa758bc0ee2f7e2eed575d051ecb80 100644
GIT binary patch
delta 2271
zcmcgtT}+#06z==Bg#sT?{z`$u5J`qWr9dlx4!*4&@>6ZgkIv~>Y5AK>#H3x!+(z}v
zApZ0_CfqD$eoKh)YU7(ucOwalF*9+POmAkq@WvQ_E|zkEiPUq-_r<czK#cKCpPcia
z^PcZL@A+%&OGE6Y;axu~x*Dk9S@VV8R+l@zXY~-}Nfv;p-Y4YhbUKbm;(~a7E$e|z
z{lk+2ii!~jR28Y|s0C4}$}-b*8OZ;MXKYBfk>(?9Re7>4M4o64(h`*~j|UniAH|Jb
z6_g@vLO2i&s*H@B$Umm;+mLpq>AH}A9AQn9iO3&D96`7dL-9bDaTu9r<AGA)I5N*8
z=*uvlW3x}-W)d-lm`2PXP9a`E%py)BUPR0xUV_hZD%e6iaL^FLt;A1fIez+XUs26G
zIIcyMqD#?Bk0?cpT%zdF%EEnmM6*@>j&`3B%|oMq8&PxGg(C9*Q$(}pA((A4G~<nM
zF8iWL@gVf0K;t#~)P1rcbw8rgXOJq#a;)sX{$%b&#`<70&nHk}mmw%Ess4EaqWKG~
z3O4hHO;nhgLW!9DT%bOwO_M^R&@WKE>(hmiq7hR|n&5JxXz%+<hD}<^$PtKGe6Y@&
zm4roLQhA?=icWI|BISO8T2Jf6ltluC)JOHZPF5^Q-aZrcpk~b~A?o!BwAHGX?2Xj?
z24%~e$t0^gm(lEa=x?(+c*Qyh?z}@%nMa_O*D89)+p;C8N`zQd3~b|~bYM*y6D3RE
zKR-#X;rNqmZh9np5~4OA+~f|3RNBB?=>(72!3H5(=@Sa@F6unZ{el5ifJFBi;;nd~
z$@mU3N#(HPa~7XBt=4&1>U~ut#kJ$(BYwe%0(z$=G<M^L!&d*GP=uT|6Y0DX8CYVg
z^&;Q>D)gE@51s~e_5ojnge%5|A=;8;eu%a%FrTv7mcu2_dM<ORH*2>;LfjB&)|ymB
zDi1WwlFC-wt6Yh6FEObTlR*|Vyfw?qk#5FDA=>rkYVSJR(WmFwNW)lAw%nOqI^s!1
z*1-*Xr0~u@i;Sw`z9M^D;RD<H2V{JwB*|@BsXQe5Zo_)%A=%F*uRB*qlT!PiBK_Xw
zDUWdZIG2xQ$P-*1(zBz$Mtg+Tr-%Ivzjf3-><8b;hAhwI{N&uk<Xjj;EX}o15s&XK
z($%pTgWqPcZcmD<!6Y*_qP-5ff*tzv=WFCK4r1s%puojK#RMr_40l3}%mCjE^gt}!
z3%%jaESd_>=}w?!f4B=W!e%I*YJ}L-EHs=bk)~&$ZrUmi;)tL!u62&LOiVc2o%Rlw
zbIR@vwRhOtTgF57HrG@~*fr4+3U^=y;7b_2hSn)jr!zxrT9jr)IcR{FXKIwt%=-*}
zoUwpq@dkWwrb(drKvRg8^3|eCFP}5WXZiA#3g%b*u`8L-e5O<>UHrL1euG2xSy2&J
z)|mWJHq`tORDvH~Vz7931jLn^<!&>pg}JLHMZPx1K)&4vU;koNf}i4%dzUUK7e0BN
zflbL%@^0K~2I-bp@&10T0BSZmmCj$kV9U2GZ2RMF#`Q3C*KysE!8S@(42-W-F`hx8
M(&?^eRI@+WUu7mi`~Uy|

delta 2527
zcmcJQeN0<b6u^64OM&tV-54Jm1%WX@Mzwr@W05jouu=w75)t`u@ngg+*bWdZg>9mU
z3-p-GEQ=Y>gc$wD@upkc5=mH$e;BtVCi;ga#Q!vziAgcR=;}GIean-e+0@<imv`^^
zy7#_w&a3~r!T*I}!3{eucBToj3nv>_p0|Amh3FMRa2UP%4pG$UbWucz1}-M#zyaLQ
z@15F5qC_GiqGEL#&Equd=*avJ(iv%<MI;bq#2t2^v6JTEStyjFnWt*zd<4~o{dVbe
zgNoqch+==_X`^QmkrY|0PI+6_m6~-G&FeI4_Nk|}bFnk!=_Z;a6U{^m(MlX7+K6`I
z5aA*^2shD5bQ9{vM`->8@g&hhJVmIw6N{b4az;roMvN1$5EH~C@hagXW(fQpj>lTA
zIqxYo(Rov9S~x|V0yQnMH0M{(2jJJpY2m?XF-7EINhoC2tnVW&9J?>{cWH^&1m%tX
zQ(7z(>_Md^|6bC<Hwc)Hi|KR_ew_?Xn$DZ~RI1=0X2m6Da(So{es)FHTpqlZd*V{z
z{|RJ1573Gm@f~<wutN)a6Q-aDHxjzAC9hESSlogr(5|%vZLD-O26wteUZ_duHb+ll
zcT9oC>b+p%wvm&%V%V2Q*w5t_OUbWT<0}V~MF<>lirTIw>wFxuwwZx_xpnWx2wL4D
zSE^c-;lRyb^BvHW>J~ZqNq_N3b@PSM(|QJl+y*mblJ*ge1-Q_g+aYo-bAPB?!6Dor
zaSVxeYs47Lwc<ivsq$Lrb92`|iaUQ7Zl*V*f5?HoFZu%yt>S8iBaqyPYeErvwz)nA
zlW&A?nW+gS2eU+>fe*stBxz0&r-|2yS>ko#4PuUXlb9#Y5Ny8?dESv5@;`$>yag?}
zC1%)5;s<bTQMoq7=CM-X1d%@)>bF0fp8al7PeLof2V`Lse@F#+)7C6(d0kSr(8N|e
z{`J+#m#=>n0_9H8PFwMx3`gX>p&PyBA?QSJ#gynK1s4+!<@j8k*@SA1o^6hg!7{%R
z#)WH@b%6?x63u0XeDdVBSG}W@`0{4WgaE_nt#_Gqdm?Jp1cUXbpbf_#n+>G4{8Jrw
zn1S1e{dk1m?e2N0URZH90yfr6i@Bs%|2GwVu*t2o7AGa*bbqatJ|C!Flh>Seu=4mC
z;M${gntDcOo*jd(ZA#c!P8*6k`L|Z1L24Hyw;=WFr6VA93sR3!8W!;Ob3WNOGNYIJ
zgq6uvaI{g0a6jc#+Dj@2OUf&3WyQrsw$g#Ya$Dt4mEAUQwDjn}P*quFRWbdO1N{hP
zyx`F3ERs(MWH`1I6Izcg$xFk}fYc*kS8u+Y-}@~{BL@6sGzGsIeH+h>?Zc(H8aZx!
z0}K>TkA{ib=$;!&NnrCt6*?vy^6Fa!0{%3eEKM4unHa3!+=K7FW0W(O*MTF+DRV!j
z;mEW@cD%m|c;QMd_O0j0{g*C)^nnR~`0&KpdJE*>OBZ8g>61RdkIuDV^-{U)`*a3S
zy48YT-A<MJuaNn*V!Sz9i2cj)A6LWYfPpXD<@TR1?N}DT5V&f(Y_h_yfQP@gU$z_J
gW)c|jR^iLIUihqr{^bl1R<iwY)}IA_@NH-EC(aZ6{r~^~

diff --git a/.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json b/.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json
index 6c1cb586..75ab69a7 100644
--- a/.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json
+++ b/.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json
@@ -67,10 +67,6 @@
               "$type": "Bookmark",
               "Name": "ST:2:0:{b9f91511-5ca5-40ec-9726-f3e3a7e534e2}"
             },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
-            },
             {
               "$type": "Bookmark",
               "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
diff --git a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json
index 75ab69a7..086d13fc 100644
--- a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json
+++ b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json
@@ -70,6 +70,10 @@
             {
               "$type": "Bookmark",
               "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
             }
           ]
         }
diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_MaterialColorService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_MaterialColorService.cs
index ff7ac211..763b3fcc 100644
--- a/SGGL/BLL/HJGL/BaseInfo/Base_MaterialColorService.cs
+++ b/SGGL/BLL/HJGL/BaseInfo/Base_MaterialColorService.cs
@@ -1,4 +1,5 @@
 using FineUIPro;
+using Model;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -23,9 +24,24 @@ namespace BLL
             get;
             set;
         }
-        private static IQueryable<Model.Base_MaterialColor> GetByQueryModle(Model.Base_MaterialColor table)
+        private static IQueryable<Model.BaseMaterialcolorOutput> GetByQueryModle(Model.BaseMaterialcolorOutput table)
         {
-            var q = from x in Funs.DB.Base_MaterialColor select x;
+            var q = from x in Funs.DB.Base_MaterialColor 
+                    join y in Funs.DB.Base_Material on x.MaterialId equals y.MaterialId into yy
+                    from y in yy.DefaultIfEmpty()
+                    select new BaseMaterialcolorOutput
+                    {
+                        MaterialId = y.MaterialId,
+                        MaterialCode = y.MaterialCode,
+                        MaterialColorId = x.MaterialColorId,
+                        UnitId = x.UnitId,
+                        ProjectId = x.ProjectId,
+                        ColorName = x.ColorName,
+                        ColorCardNo = x.ColorCardNo,
+                        RGB = x.RGB,
+                        Remark= x.Remark,
+
+                    };
             if (table == null)
             {
                 return q;
@@ -38,10 +54,18 @@ namespace BLL
             {
                 q = q.Where(x => x.UnitId.Contains(table.UnitId));
             }
+            if (!string.IsNullOrEmpty(table.ProjectId))
+            {
+                q = q.Where(x => x.ProjectId.Contains(table.ProjectId));
+            }
             if (!string.IsNullOrEmpty(table.MaterialId))
             {
                 q = q.Where(x => x.MaterialId.Contains(table.MaterialId));
             }
+            if (!string.IsNullOrEmpty(table.MaterialCode))
+            {
+                q = q.Where(x => x.MaterialCode.Contains(table.MaterialCode));
+            }
             if (!string.IsNullOrEmpty(table.ColorName))
             {
                 q = q.Where(x => x.ColorName.Contains(table.ColorName));
@@ -62,12 +86,12 @@ namespace BLL
 
             return q;
         }
-        public static List<Model.Base_MaterialColor> GetListByQueryModle(Model.Base_MaterialColor table)
+        public static List<Model.BaseMaterialcolorOutput> GetListByQueryModle(Model.BaseMaterialcolorOutput table)
         {
             return GetByQueryModle(table).ToList();
 
         }
-        public static (List<Model.Base_MaterialColor> Data, int Total) GetListByQueryModle(Model.Base_MaterialColor table, int pageIndex = 0, int pageSize = 20)
+        public static (List<Model.BaseMaterialcolorOutput> Data, int Total) GetListByQueryModle(Model.BaseMaterialcolorOutput table, int pageIndex = 0, int pageSize = 20)
         {
             var baseQuery = GetByQueryModle(table);
             var pagedData = baseQuery
@@ -87,7 +111,7 @@ namespace BLL
         /// <param name="table"></param>
         /// <param name="grid1"></param>
         /// <returns></returns>
-        public static IEnumerable GetListData(Model.Base_MaterialColor table, Grid grid1)
+        public static IEnumerable GetListData(Model.BaseMaterialcolorOutput table, Grid grid1)
         {
             var q = GetByQueryModle(table);
             Count = q.Count();
@@ -102,6 +126,7 @@ namespace BLL
                    {
                        x.MaterialColorId,
                        x.UnitId,
+                       x.ProjectId,
                        x.MaterialId,
                        x.ColorName,
                        x.ColorCardNo,
@@ -125,6 +150,7 @@ namespace BLL
             {
                 MaterialColorId = newtable.MaterialColorId,
                 UnitId = newtable.UnitId,
+                ProjectId= newtable.ProjectId,
                 MaterialId = newtable.MaterialId,
                 ColorName = newtable.ColorName,
                 ColorCardNo = newtable.ColorCardNo,
@@ -144,6 +170,7 @@ namespace BLL
             {
                 table.MaterialColorId = newtable.MaterialColorId;
                 table.UnitId = newtable.UnitId;
+                table.ProjectId = newtable.ProjectId;
                 table.MaterialId = newtable.MaterialId;
                 table.ColorName = newtable.ColorName;
                 table.ColorCardNo = newtable.ColorCardNo;
diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColor.aspx b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColor.aspx
index 7c0ca140..8564fed7 100644
--- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColor.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColor.aspx
@@ -55,12 +55,8 @@
                         <ItemTemplate>
                             <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                         </ItemTemplate>
-                    </f:TemplateField>    
-                               
-                          <f:RenderField Width="150px" ColumnID="UnitId" DataField="UnitId" SortField="UnitId"
-                             FieldType="String" HeaderText="单位id" TextAlign="Left" HeaderTextAlign="Center" >
-                           </f:RenderField>
-                          <f:RenderField Width="150px" ColumnID="MaterialId" DataField="MaterialId" SortField="MaterialId"
+                    </f:TemplateField> 
+                          <f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
                              FieldType="String" HeaderText="材质id" TextAlign="Left" HeaderTextAlign="Center" >
                            </f:RenderField>
                           <f:RenderField Width="150px" ColumnID="ColorName" DataField="ColorName" SortField="ColorName"
@@ -99,7 +95,7 @@
     </f:Panel>
     <f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
         IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
-        Title="编辑Base_MaterialColor" EnableIFrame="true" Height="650px"
+        Title="编辑" EnableIFrame="true" Height="650px"
         Width="1200px">
     </f:Window>
     <f:Menu ID="Menu1" runat="server">      
diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColor.aspx.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColor.aspx.cs
index 70e44f29..6010c49f 100644
--- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColor.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColor.aspx.cs
@@ -29,7 +29,8 @@ namespace FineUIPro.Web.HJGL.BaseInfo
         /// </summary>
         private void BindGrid()
         {
-            Model.Base_MaterialColor table = new Model.Base_MaterialColor();
+            Model.BaseMaterialcolorOutput table = new Model.BaseMaterialcolorOutput();
+            table.ProjectId=this.CurrUser.LoginProjectId;
             var tb = BLL.BaseMaterialcolorService.GetListByQueryModle(table, Grid1.PageIndex, Grid1.PageSize);
             Grid1.RecordCount = tb.Total;
             Grid1.DataSource = tb.Data;
@@ -91,7 +92,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
         /// <param name="e"></param>
         protected void btnNew_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("Base_MaterialColorEdit.aspx?MaterialColorId={0}", string.Empty, "增加 - ")));
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MaterialColorEdit.aspx?MaterialColorId={0}", string.Empty, "增加 - ")));
         }
 
         /// <summary>
@@ -110,7 +111,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
             var model = BLL.BaseMaterialcolorService.GetModelById(ID);
             if (model != null) ///已上报时不能删除
             {
-                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("Base_MaterialColorEdit.aspx?MaterialColorId={0}", ID, "编辑 - ")));
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MaterialColorEdit.aspx?MaterialColorId={0}", ID, "编辑 - ")));
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorEdit.aspx b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorEdit.aspx
index 697b092a..61182744 100644
--- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorEdit.aspx
@@ -5,7 +5,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
     <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
 </head>
@@ -15,57 +15,81 @@
         <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="txtUnitId" runat="server" Label="单位id" MaxLength="200"  >
-                         </f:TextBox>
-                           </Items>
-                          </f:FormRow>
-                         <f:FormRow>
-                          <Items>
-                         <f:TextBox ID="txtMaterialId" runat="server" Label="材质id" MaxLength="200"  >
-                         </f:TextBox>
-                           </Items>
-                          </f:FormRow>
-                         <f:FormRow>
-                          <Items>
-                         <f:TextBox ID="txtColorName" runat="server" Label="颜色名称" MaxLength="200"  >
-                         </f:TextBox>
-                           </Items>
-                          </f:FormRow>
-                         <f:FormRow>
-                          <Items>
-                         <f:TextBox ID="txtColorCardNo" runat="server" Label="色卡号" MaxLength="200"  >
-                         </f:TextBox>
-                           </Items>
-                          </f:FormRow>
-                         <f:FormRow>
-                          <Items>
-                         <f:TextBox ID="txtRGB" runat="server" Label="" MaxLength="200"  >
-                         </f:TextBox>
-                           </Items>
-                          </f:FormRow>
-                         <f:FormRow>
-                          <Items>
-                         <f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="200"  >
-                         </f:TextBox>
-                           </Items>
-                          </f:FormRow>
-                
+
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownBox runat="server" ID="drpMaterialId" EmptyText="请从下拉表格中选择" MatchFieldWidth="false" Values="105" EnableMultiSelect="false" Label="材质">
+                            <PopPanel>
+                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="MaterialId" DataTextField="MaterialCode"
+                                    DataKeyNames="MaterialId" Hidden="true" Width="550px" Height="600px" EnableMultiSelect="false">
+                                    <Columns>
+                                        <f:BoundField DataField="MaterialCode" DataFormatString="{0}" HeaderText="型号、牌号、级别" Width="180px" />
+                                        <f:TemplateField HeaderText="材质类型">
+                                            <ItemTemplate>
+                                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertSteelType(Eval("SteelType")) %>'></asp:Label>
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="MaterialType" HeaderText="材料标准" />
+                                    </Columns>
+                                    <Toolbars>
+                                        <f:Toolbar runat="server" Position="Top">
+                                            <Items>
+                                                <f:TextBox ID="txtMaterialCode" runat="server" Label="型号、牌号、级别"
+                                                    EmptyText="输入查询条件" Width="320px" LabelWidth="200px" LabelAlign="Right">
+                                                </f:TextBox>
+                                                <f:DropDownList ID="drpSteType" runat="server" Label="材质类型"
+                                                    EnableEdit="true" Width="300px" LabelWidth="140px" LabelAlign="Right">
+                                                </f:DropDownList>
+                                                <f:Button ID="btnQuery" Text="查询" Icon="SystemSearch"
+                                                    EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
+                                                </f:Button>
+                                            </Items>
+                                        </f:Toolbar>
+                                    </Toolbars>
+                                </f:Grid>
+                            </PopPanel>
+                        </f:DropDownBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtColorName" runat="server" Label="颜色名称" MaxLength="200">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtColorCardNo" runat="server" Label="色卡号" MaxLength="200">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtRGB" runat="server" Label="RGB代码" MaxLength="200">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="200">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
             </Rows>
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
                     <Items>
                         <f:ToolbarFill runat="server"></f:ToolbarFill>
-                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1" 
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
                             OnClick="btnSave_Click">
                         </f:Button>
-                        <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭"  runat="server" Icon="SystemClose">
+                        <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
                         </f:Button>
                     </Items>
                 </f:Toolbar>
             </Toolbars>
-        </f:Form>          
+        </f:Form>
         <f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
             Height="500px">
diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorEdit.aspx.cs
index 4af16fb9..df0424e4 100644
--- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorEdit.aspx.cs
@@ -1,6 +1,8 @@
 using BLL;
 using System;
 using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
 using System.Linq;
 using System.Web;
 using System.Web.UI;
@@ -8,9 +10,12 @@ using System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HJGL.BaseInfo
 {
-    public partial class MaterialColorEdit: PageBase
+    public partial class MaterialColorEdit : PageBase
     {
-        #region  
+        #region
+
+        #region Properties
+
         /// <summary>
         /// 主键
         /// </summary>
@@ -25,8 +30,18 @@ namespace FineUIPro.Web.HJGL.BaseInfo
                 ViewState["MaterialColorId"] = value;
             }
         }
+
+        #endregion Properties
+
         #endregion
 
+        #region Methods
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
@@ -34,23 +49,32 @@ namespace FineUIPro.Web.HJGL.BaseInfo
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 ////权限按钮方法
                 this.GetButtonPower();
+                this.drpSteType.DataTextField = "Text";
+                this.drpSteType.DataValueField = "Value";
+                this.drpSteType.DataSource = BLL.DropListService.HJGL_GetSteTypeList();
+                this.drpSteType.DataBind();
+                Funs.FineUIPleaseSelect(this.drpSteType);
+                BindGrid(); 
                 this.MaterialColorId = Request.Params["MaterialColorId"];
                 if (!string.IsNullOrEmpty(this.MaterialColorId))
                 {
                     Model.Base_MaterialColor model = BLL.BaseMaterialcolorService.GetModelById(this.MaterialColorId);
                     if (model != null)
                     {
-                        this.txtUnitId.Text = model.UnitId;
-                        this.txtMaterialId.Text = model.MaterialId;
+                        this.drpMaterialId.Value = model.MaterialId;
+                        this.drpMaterialId.Text = null;
                         this.txtColorName.Text = model.ColorName;
                         this.txtColorCardNo.Text = model.ColorCardNo;
                         this.txtRGB.Text = model.RGB;
                         this.txtRemark.Text = model.Remark;
-
                     }
                 }
             }
         }
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
 
         /// <summary>
         /// 保存按钮
@@ -60,8 +84,8 @@ namespace FineUIPro.Web.HJGL.BaseInfo
         protected void btnSave_Click(object sender, EventArgs e)
         {
             Model.Base_MaterialColor table = new Model.Base_MaterialColor();
-            table.UnitId = this.txtUnitId.Text;
-            table.MaterialId = this.txtMaterialId.Text;
+            table.MaterialId = this.drpMaterialId.Value;
+            table.ProjectId = this.CurrUser.LoginProjectId;
             table.ColorName = this.txtColorName.Text;
             table.ColorCardNo = this.txtColorCardNo.Text;
             table.RGB = this.txtRGB.Text;
@@ -70,7 +94,6 @@ namespace FineUIPro.Web.HJGL.BaseInfo
             {
                 table.MaterialColorId = SQLHelper.GetNewID(typeof(Model.Base_MaterialColor));
                 BLL.BaseMaterialcolorService.Add(table);
-
             }
             else
             {
@@ -80,7 +103,53 @@ namespace FineUIPro.Web.HJGL.BaseInfo
             PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
         }
 
+        protected string ConvertSteelType(object SteelType)
+        {
+            string name = string.Empty;
+            if (SteelType != null)
+            {
+                var dropValue = BLL.DropListService.HJGL_GetSteTypeList().FirstOrDefault(x => x.Value == SteelType.ToString());
+                if (dropValue != null)
+                {
+                    name = dropValue.Text;
+                }
+            }
+
+            return name;
+        }
+
+
+        private void BindGrid()
+        {
+            string strSql = @"SELECT MaterialId,MaterialCode,MaterialType,SteelType,Remark,MaterialClass,MaterialGroup,MetalType"
+                         + @" FROM dbo.Base_Material WHERE 1=1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+
+            if (!string.IsNullOrEmpty(this.txtMaterialCode.Text.Trim()))
+            {
+                strSql += " AND MaterialCode LIKE @MaterialCode";
+                listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text.Trim() + "%"));
+            }
+
+            if (this.drpSteType.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND SteelType = @SteelType";
+                listStr.Add(new SqlParameter("@SteelType", this.drpSteType.SelectedValue));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #region 查询
+        #endregion
+
         #region 获取按钮权限
+
         /// <summary>
         /// 获取按钮权限
         /// </summary>
@@ -97,7 +166,10 @@ namespace FineUIPro.Web.HJGL.BaseInfo
                 }
             }
         }
-        #endregion        
+
+        #endregion Methods
+
+        #endregion
 
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorEdit.aspx.designer.cs
index 1388cb26..ff92970d 100644
--- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialColorEdit.aspx.designer.cs
@@ -42,22 +42,58 @@ namespace FineUIPro.Web.HJGL.BaseInfo
         protected global::FineUIPro.Form SimpleForm1;
 
         /// <summary>
-        /// txtUnitId 控件。
+        /// drpMaterialId 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtUnitId;
+        protected global::FineUIPro.DropDownBox drpMaterialId;
 
         /// <summary>
-        /// txtMaterialId 控件。
+        /// Grid1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtMaterialId;
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label3;
+
+        /// <summary>
+        /// txtMaterialCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMaterialCode;
+
+        /// <summary>
+        /// drpSteType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpSteType;
+
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
 
         /// <summary>
         /// txtColorName 控件。
diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
index 0069c9bb..5b2405ae 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
+++ b/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="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>
 <TreeNode id="5CBE9258-6FE9-47A8-BFDD-3BDD90F7DECC" Text="图纸导入" NavigateUrl="HJGL/DataImport/DrawingImport.aspx"></TreeNode>
@@ -11,12 +12,13 @@
 </TreeNode>
 <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="53948077-B51D-4FF3-BFB0-AB4E27C42875" Text="排产计划" NavigateUrl="HJGL/PreDesign/ProductionSchedulingPlan.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="BD9C587E-17C2-49F1-82AE-A05117E41D89" Text="安装清单" NavigateUrl="HJGL/PreDesign/InstallList.aspx"></TreeNode>
-<TreeNode id="25DED954-10C9-47CC-99F2-C44FDE9E0A81" Text="包装管理" NavigateUrl="HJGL/PreDesign/PackagingManage.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>
diff --git a/SGGL/Model/HJGL/BaseMaterialcolorOutput.cs b/SGGL/Model/HJGL/BaseMaterialcolorOutput.cs
new file mode 100644
index 00000000..18137207
--- /dev/null
+++ b/SGGL/Model/HJGL/BaseMaterialcolorOutput.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class BaseMaterialcolorOutput
+    {
+        public string MaterialColorId { get; set; }
+        public string UnitId { get; set; }
+        public string ProjectId { get; set; }
+        public string MaterialId { get; set; }
+        public string MaterialCode { get; set; }
+        public string ColorName { get; set; }
+        public string ColorCardNo { get; set; }
+        public string RGB { get; set; }
+        public string Remark { get; set; }
+    }
+}
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index ff130da6..aa16a05a 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -22438,6 +22438,8 @@ namespace Model
 		
 		private string _UnitId;
 		
+		private string _ProjectId;
+		
 		private string _MaterialId;
 		
 		private string _ColorName;
@@ -22456,6 +22458,8 @@ namespace Model
     partial void OnMaterialColorIdChanged();
     partial void OnUnitIdChanging(string value);
     partial void OnUnitIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
     partial void OnMaterialIdChanging(string value);
     partial void OnMaterialIdChanged();
     partial void OnColorNameChanging(string value);
@@ -22513,6 +22517,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		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="_MaterialId", DbType="NVarChar(50)")]
 		public string MaterialId
 		{
diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj
index 6060b537..d4309d1c 100644
--- a/SGGL/Model/Model.csproj
+++ b/SGGL/Model/Model.csproj
@@ -233,6 +233,7 @@
     <Compile Include="FastReportItem.cs" />
     <Compile Include="HandleStep.cs" />
     <Compile Include="HJGL\3DParameter.cs" />
+    <Compile Include="HJGL\BaseMaterialcolorOutput.cs" />
     <Compile Include="HJGL\MaterialStockItem.cs" />
     <Compile Include="APIItem\HJGL\PackagingManageItem.cs" />
     <Compile Include="HJGL\PackagingManagePrintOutput.cs" />