diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
index 0e0b2395..8aa0fe9a 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
@@ -407,7 +407,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
             var q = from x in db.View_HJGL_WeldJoint where x.UnitWorkId == unitworkid select x;
             string rate = "";
  
-            if (q != null && q.Count() > 0)
+            if (q != null && q.Count() > 0&&pipeline.Count()>0)
             {
                 var proSum = (from x in q
                               join y in pipeline on x.PipelineId equals y.PipelineId into temp
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 3fedf6c2..1e49074f 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -59831,6 +59831,8 @@ namespace Model
 		
 		private System.Nullable<decimal> _SumMoney;
 		
+		private string _NextManId;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Base_Unit> _Base_Unit;
@@ -59875,6 +59877,8 @@ namespace Model
     partial void OnCompileDateChanged();
     partial void OnSumMoneyChanging(System.Nullable<decimal> value);
     partial void OnSumMoneyChanged();
+    partial void OnNextManIdChanging(string value);
+    partial void OnNextManIdChanged();
     #endregion
 		
 		public CostGoods_CostManage()
@@ -60199,6 +60203,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextManId", DbType="NVarChar(50)")]
+		public string NextManId
+		{
+			get
+			{
+				return this._NextManId;
+			}
+			set
+			{
+				if ((this._NextManId != value))
+				{
+					this.OnNextManIdChanging(value);
+					this.SendPropertyChanging();
+					this._NextManId = value;
+					this.SendPropertyChanged("NextManId");
+					this.OnNextManIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CostGoods_CostManage_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -191083,6 +191107,8 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _RealNamePushTime;
 		
+		private System.Nullable<bool> _IsSynchro;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Base_Unit> _Base_Unit;
@@ -191115,6 +191141,8 @@ namespace Model
     partial void OnAuditManChanged();
     partial void OnRealNamePushTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnRealNamePushTimeChanged();
+    partial void OnIsSynchroChanging(System.Nullable<bool> value);
+    partial void OnIsSynchroChanged();
     #endregion
 		
 		public Project_ProjectUnit()
@@ -191372,6 +191400,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSynchro", DbType="Bit")]
+		public System.Nullable<bool> IsSynchro
+		{
+			get
+			{
+				return this._IsSynchro;
+			}
+			set
+			{
+				if ((this._IsSynchro != value))
+				{
+					this.OnIsSynchroChanging(value);
+					this.SendPropertyChanging();
+					this._IsSynchro = value;
+					this.SendPropertyChanged("IsSynchro");
+					this.OnIsSynchroChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Project_ProjectUnit_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{