diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
index fd9af7d8..d7433eef 100644
--- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
@@ -151,7 +151,6 @@ namespace BLL
                             if (getOtherPersons.Count() > 0)
                             {
                                 foreach (var item in getOtherPersons)
-
                                 {
                                     item.OutTime = DateTime.Now;
                                     item.States = Const.ProjectPersonStates_2;
diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
index 244728b8..9f8481e8 100644
--- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
@@ -774,6 +774,20 @@ namespace BLL
                         {
                             setPersonItemInOut = true;
                         }
+                        else
+                        {
+                            var getPersons = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == newPerson.IdentityCard);
+                            if (getPersons != null && (!getPersons.MultiProject.HasValue || getPersons.MultiProject == false))
+                            {
+                                var getdate = newPerson.InTime.HasValue ? newPerson.InTime.Value.AddDays(-1) : DateTime.Now;
+                                var getPersonItems = db.SitePerson_PersonItem.Where(x => x.PersonId == newPerson.PersonId && x.ProjectId  != newPerson.ProjectId && !x.OutTime.HasValue);
+                                foreach(var item in getPersonItems)
+                                {
+                                    item.OutTime = getdate;
+                                    db.SubmitChanges();
+                                }
+                            }
+                        }
                     }
                     if (setPersonItemInOut)
                     {
diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs
index 828304e3..3f866072 100644
--- a/SGGL/BLL/Person/Person_PersonsService.cs
+++ b/SGGL/BLL/Person/Person_PersonsService.cs
@@ -160,15 +160,27 @@ namespace BLL
         /// <returns></returns>
         public static string getCurrentProjectName(string PersonId)
         {
-            var getItem = Funs.DB.SitePerson_PersonItem.FirstOrDefault(u => u.PersonId == PersonId && !u.OutTime.HasValue);
-            if (getItem != null)
+            string name = string.Empty;
+            var getItem = Funs.DB.SitePerson_PersonItem.Where(u => u.PersonId == PersonId && !u.OutTime.HasValue);
+            if (getItem.Count() > 0)
             {
-                return ProjectService.GetShortNameByProjectId(getItem.ProjectId); 
-            }
-            else
-            {
-                return null;
+                foreach (var item in getItem)
+                {
+                    string pname= ProjectService.GetShortNameByProjectId(item.ProjectId);
+                    if (string.IsNullOrEmpty(name))
+                    {
+                        name = pname;
+                    }
+                    else
+                    {
+                        if (!name.Contains(pname))
+                        {
+                            name += "," + pname;
+                        }
+                    }
+                }
             }
+            return name;
         }
 
         /// <summary>
@@ -177,17 +189,29 @@ namespace BLL
         /// <param name="WorkPostId"></param>
         /// <param name="PersonId"></param>
         /// <returns></returns>
-        public static string getCurrentProjectWorkPostName( string PersonId)
+        public static string getCurrentProjectWorkPostName(string PersonId)
         {
-            var getItem = Funs.DB.SitePerson_PersonItem.FirstOrDefault(u => u.PersonId == PersonId && !u.OutTime.HasValue);
-            if (getItem != null)
+            string name = string.Empty;
+            var getItem = Funs.DB.SitePerson_PersonItem.Where(u => u.PersonId == PersonId && !u.OutTime.HasValue);
+            if (getItem.Count() > 0)
             {
-                return WorkPostService.getWorkPostNamesWorkPostIds(getItem.WorkPostId);
-            }
-            else
-            {
-                return null;
+                foreach (var item in getItem)
+                {
+                    string pname = WorkPostService.getWorkPostNamesWorkPostIds(item.WorkPostId);
+                    if (string.IsNullOrEmpty(name))
+                    {
+                        name = pname;
+                    }
+                    else
+                    {
+                        if (!name.Contains(pname))
+                        {
+                            name += "," + pname;
+                        }
+                    }
+                }
             }
+            return name;
         }
         #endregion
 
diff --git a/SGGL/FineUIPro.Web/Person/DepartPerson.aspx b/SGGL/FineUIPro.Web/Person/DepartPerson.aspx
index 518ac4a8..fe0153fd 100644
--- a/SGGL/FineUIPro.Web/Person/DepartPerson.aspx
+++ b/SGGL/FineUIPro.Web/Person/DepartPerson.aspx
@@ -106,7 +106,7 @@
                                 <asp:Label ID="lbIsPost" runat="server" Text='<%# GetIsPost(Eval("IsPost")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField Width="90px" ColumnID="CurrentProjectName" DataField="CurrentProjectName"
+                        <f:RenderField Width="120px" ColumnID="CurrentProjectName" DataField="CurrentProjectName"
                             FieldType="String" HeaderText="当前项目" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="120px" ColumnID="CurrentProjectWorkPostName" DataField="CurrentProjectWorkPostName"
@@ -157,7 +157,7 @@
                         <f:RenderField Width="100px" ColumnID="RelativeTel" DataField="RelativeTel" Hidden="true"
                             FieldType="String" HeaderText="亲属电话" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:TemplateField Width="80px" ColumnID="Actions" HeaderText="操作" HeaderTextAlign="Center" TextAlign="Center">
+                        <f:TemplateField Width="70px" ColumnID="Actions" HeaderText="操作" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <div class="action btncontainer"></div>
                             </ItemTemplate>
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index fc50ecb2..2f3d7725 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -73854,7 +73854,7 @@ namespace Model
 			OnCreated();
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(15) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
 		public string MaterialCode
 		{
 			get
@@ -73958,7 +73958,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(3000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string MaterialDef
 		{
 			get
@@ -78548,7 +78548,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(15)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")]
 		public string MaterialCode
 		{
 			get
@@ -82896,7 +82896,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")]
 		public string CanWelderCode
 		{
 			get
@@ -122265,7 +122265,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(100)")]
 		public string MaterialName
 		{
 			get
@@ -122285,7 +122285,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(200)")]
 		public string SpecificationAndModel
 		{
 			get
@@ -122305,7 +122305,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(100)")]
 		public string MaterialCode
 		{
 			get
@@ -122325,7 +122325,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material", DbType="NVarChar(100)")]
 		public string Material
 		{
 			get
@@ -235827,7 +235827,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")]
 		public string CanWelderCode
 		{
 			get