diff --git a/MESClassLibrary/BLL/BasicInfo/Bom_MKBLL.cs b/MESClassLibrary/BLL/BasicInfo/Bom_MKBLL.cs
index 673e144..2adc99b 100644
--- a/MESClassLibrary/BLL/BasicInfo/Bom_MKBLL.cs
+++ b/MESClassLibrary/BLL/BasicInfo/Bom_MKBLL.cs
@@ -60,9 +60,13 @@ namespace MESClassLibrary.BLL.BasicInfo
                 //}
 
                 //初始化要更新的字段
-                string[] proNames = new string[2];
+                string[] proNames = new string[6];
                 proNames[0] = "PartNo1";
                 proNames[1] = "PartNo2";
+                proNames[2] = "LineName";
+                proNames[3] = "StationNo";
+                proNames[4] = "IsChecked";
+                proNames[5] = "IsPartAssemble";
 
                 //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
                 //如果没有初始化必填字段，更新会报错
@@ -102,7 +106,7 @@ namespace MESClassLibrary.BLL.BasicInfo
         /// 查询全部信息分页
         /// </summary>
         /// <returns></returns>
-        public string SearchInfoAll(string page, string pagesize, string partNo1, string partNo2, string placeName)
+        public string SearchInfoAll(string page, string pagesize, string partNo1, string partNo2, string lineName)
         {
             try
             {
@@ -121,9 +125,9 @@ namespace MESClassLibrary.BLL.BasicInfo
                     list = list.Where(p => p.PartNo2 != null && p.PartNo2.Contains(partNo2) ).ToList();
                 }
 
-                if (!String.IsNullOrEmpty(placeName))
+                if (!String.IsNullOrEmpty(lineName))
                 {
-                    list = list.Where(p => p.PlaceName != null && p.PlaceName.Contains(placeName)).ToList();
+                    list = list.Where(p => p.LineName != null && p.LineName.Contains(lineName)).ToList();
                 }
 
                 if (list.Count > 0)
diff --git a/MESClassLibrary/EFModel/BBMPT.Context.cs b/MESClassLibrary/EFModel/BBMPT.Context.cs
index 7b9b865..d8dbedc 100644
--- a/MESClassLibrary/EFModel/BBMPT.Context.cs
+++ b/MESClassLibrary/EFModel/BBMPT.Context.cs
@@ -195,7 +195,7 @@ namespace MESClassLibrary.EFModel
         public virtual DbSet<t_XD_ProductType> t_XD_ProductType { get; set; }
         public virtual DbSet<W_XD_Product_del> W_XD_Product_del { get; set; }
         public virtual DbSet<t_XD_StockArea> t_XD_StockArea { get; set; }
-        public virtual DbSet<tb_Bom_MK> tb_Bom_MK { get; set; }
         public virtual DbSet<tb_ZP_MK_Plan> tb_ZP_MK_Plan { get; set; }
+        public virtual DbSet<tb_Bom_MK> tb_Bom_MK { get; set; }
     }
 }
diff --git a/MESClassLibrary/EFModel/BBMPT.edmx b/MESClassLibrary/EFModel/BBMPT.edmx
index b2a1c18..c8ab5f7 100644
--- a/MESClassLibrary/EFModel/BBMPT.edmx
+++ b/MESClassLibrary/EFModel/BBMPT.edmx
@@ -662,7 +662,7 @@
           <Property Name="PartNo2" Type="nvarchar" MaxLength="50" />
           <Property Name="UserID" Type="char" MaxLength="36" />
           <Property Name="IsChecked" Type="bit" />
-          <Property Name="PlaceName" Type="nvarchar" MaxLength="100" />
+          <Property Name="LineName" Type="nvarchar" MaxLength="100" />
           <Property Name="IsPartAssemble" Type="int" />
           <Property Name="StationNo" Type="varchar" MaxLength="50" />
         </EntityType>
@@ -3591,8 +3591,8 @@
           <EntitySet Name="t_XD_ProductType" EntityType="BBMPTModel.t_XD_ProductType" />
           <EntitySet Name="W_XD_Product_del" EntityType="BBMPTModel.W_XD_Product_del" />
           <EntitySet Name="t_XD_StockArea" EntityType="BBMPTModel.t_XD_StockArea" />
-          <EntitySet Name="tb_Bom_MK" EntityType="BBMPTModel.tb_Bom_MK" />
           <EntitySet Name="tb_ZP_MK_Plan" EntityType="BBMPTModel.tb_ZP_MK_Plan" />
+          <EntitySet Name="tb_Bom_MK" EntityType="BBMPTModel.tb_Bom_MK" />
           </EntityContainer>
         <EntityType Name="LogErr">
           <Key>
@@ -6081,19 +6081,6 @@
           <Property Name="Name" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
           <Property Name="U8Code" Type="String" MaxLength="20" FixedLength="false" Unicode="true" />
         </EntityType>
-        <EntityType Name="tb_Bom_MK">
-          <Key>
-            <PropertyRef Name="BomID" />
-          </Key>
-          <Property Name="BomID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="PartNo1" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="PartNo2" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="UserID" Type="String" MaxLength="36" FixedLength="true" Unicode="false" />
-          <Property Name="IsChecked" Type="Boolean" />
-          <Property Name="PlaceName" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
-          <Property Name="IsPartAssemble" Type="Int32" />
-          <Property Name="StationNo" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
-        </EntityType>
         <EntityType Name="tb_ZP_MK_Plan">
           <Key>
             <PropertyRef Name="ID" />
@@ -6114,6 +6101,19 @@
           <Property Name="FinishTime" Type="DateTime" Precision="3" />
           <Property Name="RepairCount" Type="Int32" />
         </EntityType>
+        <EntityType Name="tb_Bom_MK">
+          <Key>
+            <PropertyRef Name="BomID" />
+          </Key>
+          <Property Name="BomID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="PartNo1" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="PartNo2" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="UserID" Type="String" MaxLength="36" FixedLength="true" Unicode="false" />
+          <Property Name="IsChecked" Type="Boolean" />
+          <Property Name="LineName" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="IsPartAssemble" Type="Int32" />
+          <Property Name="StationNo" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+        </EntityType>
         </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
@@ -8754,20 +8754,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="tb_Bom_MK">
-            <EntityTypeMapping TypeName="BBMPTModel.tb_Bom_MK">
-              <MappingFragment StoreEntitySet="tb_Bom_MK">
-                <ScalarProperty Name="StationNo" ColumnName="StationNo" />
-                <ScalarProperty Name="IsPartAssemble" ColumnName="IsPartAssemble" />
-                <ScalarProperty Name="PlaceName" ColumnName="PlaceName" />
-                <ScalarProperty Name="IsChecked" ColumnName="IsChecked" />
-                <ScalarProperty Name="UserID" ColumnName="UserID" />
-                <ScalarProperty Name="PartNo2" ColumnName="PartNo2" />
-                <ScalarProperty Name="PartNo1" ColumnName="PartNo1" />
-                <ScalarProperty Name="BomID" ColumnName="BomID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="tb_ZP_MK_Plan">
             <EntityTypeMapping TypeName="BBMPTModel.tb_ZP_MK_Plan">
               <MappingFragment StoreEntitySet="tb_ZP_MK_Plan">
@@ -8789,6 +8775,20 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="tb_Bom_MK">
+            <EntityTypeMapping TypeName="BBMPTModel.tb_Bom_MK">
+              <MappingFragment StoreEntitySet="tb_Bom_MK">
+                <ScalarProperty Name="StationNo" ColumnName="StationNo" />
+                <ScalarProperty Name="IsPartAssemble" ColumnName="IsPartAssemble" />
+                <ScalarProperty Name="LineName" ColumnName="LineName" />
+                <ScalarProperty Name="IsChecked" ColumnName="IsChecked" />
+                <ScalarProperty Name="UserID" ColumnName="UserID" />
+                <ScalarProperty Name="PartNo2" ColumnName="PartNo2" />
+                <ScalarProperty Name="PartNo1" ColumnName="PartNo1" />
+                <ScalarProperty Name="BomID" ColumnName="BomID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           </EntityContainerMapping>
       </Mapping>
     </edmx:Mappings>
diff --git a/MESClassLibrary/EFModel/BBMPT.edmx.diagram b/MESClassLibrary/EFModel/BBMPT.edmx.diagram
index 1233514..d945138 100644
--- a/MESClassLibrary/EFModel/BBMPT.edmx.diagram
+++ b/MESClassLibrary/EFModel/BBMPT.edmx.diagram
@@ -173,8 +173,8 @@
         <EntityTypeShape EntityType="BBMPTModel.View_1" Width="1.5" PointX="0.5" PointY="18.625" IsExpanded="false" />
 		  <AssociationConnector Association="BBMPTModel.FK_T_SYS_RO_REFERENCE_T_SYS_PO" />
         <EntityTypeShape EntityType="BBMPTModel.tb_ForeignColorMap" Width="1.5" PointX="0.5" PointY="3.75" IsExpanded="false" />
-        <EntityTypeShape EntityType="BBMPTModel.tb_Bom_MK" Width="1.5" PointX="7.5884246675243716" PointY="25.518843707404493" />
         <EntityTypeShape EntityType="BBMPTModel.tb_ZP_MK_Plan" Width="1.5" PointX="8.6183643250811688" PointY="11.701445868099782" />
+        <EntityTypeShape EntityType="BBMPTModel.tb_Bom_MK" Width="1.5" PointX="0.83173512333619182" PointY="30.64839208063129" />
         
         
         
diff --git a/MESClassLibrary/EFModel/tb_Bom_MK.cs b/MESClassLibrary/EFModel/tb_Bom_MK.cs
index 8143218..fbecd76 100644
--- a/MESClassLibrary/EFModel/tb_Bom_MK.cs
+++ b/MESClassLibrary/EFModel/tb_Bom_MK.cs
@@ -19,7 +19,7 @@ namespace MESClassLibrary.EFModel
         public string PartNo2 { get; set; }
         public string UserID { get; set; }
         public Nullable<bool> IsChecked { get; set; }
-        public string PlaceName { get; set; }
+        public string LineName { get; set; }
         public Nullable<int> IsPartAssemble { get; set; }
         public string StationNo { get; set; }
     }