diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal
index 37c1b4c..a3b4dbf 100644
Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/HJGL_DS/.vs/config/applicationhost.config b/HJGL_DS/.vs/config/applicationhost.config
index befab23..03a3064 100644
--- a/HJGL_DS/.vs/config/applicationhost.config
+++ b/HJGL_DS/.vs/config/applicationhost.config
@@ -162,7 +162,7 @@
             </site>
             <site name="FineUIPro.Web" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web" />
+                    <virtualDirectory path="/" physicalPath="E:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:64304:localhost" />
@@ -170,7 +170,7 @@
             </site>
             <site name="WebAPI" id="3">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\工作\鼎盛\HJGL_DS\HJGL_DS\WebAPI" />
+                    <virtualDirectory path="/" physicalPath="E:\鼎盛\HJGL_DS\HJGL_DS\WebAPI" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:32379:localhost" />
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs
index 7fa8b15..ad2e7ab 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs
@@ -232,10 +232,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_jot").ToString());
             sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_bw1jot").ToString());
             sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_hotjot").ToString());
-            sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_Trusthotjot").ToString());
-            sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_Inputhotjot").ToString());
-            sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_OKhotjot").ToString());
-            sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("total_NotOKhotjot").ToString());
+            sb.AppendFormat("<td></td>");
+            sb.AppendFormat("<td>{0}</td>", this.Grid1.SummaryData.GetValue("maybe_bw1jot").ToString());
             sb.Append("</tr>");
             sb.Append("</table>");
 
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
index 46a3358..12ca7b7 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
@@ -1086,11 +1086,13 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                     }
                     if (weldTypeName == "焊丝" || weldTypeName == "焊条")
                     {
-                        number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : "";
+                        //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";
+                        number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "根";
                     }
                     else
                     {
-                        number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "Kg" : "";
+                        //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0#") + "Kg" : "";
+                        number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "Kg";
                     }
                     if (!string.IsNullOrEmpty(material.StoreMan))
                     {
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs
index ef9590a..aa66c47 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs
@@ -40,12 +40,12 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                         if (type.WeldTypeName == "焊条" || type.WeldTypeName == "焊丝")
                         {
                             unit = "根";
-                            txtAmount.Text = mat.Amount.Value.ToString("0.##") + "根";
+                            txtAmount.Text = (mat.Amount.Value + mat.TwoAmount.Value).ToString("0.##") + "根";
                         }
                         else
                         {
                             unit = "公斤";
-                            txtAmount.Text = mat.Amount.Value.ToString("0.##") + "Kg";
+                            txtAmount.Text = (mat.Amount.Value + mat.TwoAmount.Value).ToString("0.##") + "Kg";
                         }
 
                         string[] weldNames = weld.WeldName.Split('/');
@@ -280,11 +280,13 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                     }
                     if (weldTypeName == "焊丝" || weldTypeName == "焊条")
                     {
-                        number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : "";
+                        //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";
+                        number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "根";
                     }
                     else
                     {
-                        number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "Kg" : "";
+                        //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0#") + "Kg" : "";
+                        number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "Kg";
                     }
                     if (!string.IsNullOrEmpty(material.StoreMan))
                     {
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
index 25a2492..73c5d13 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs
@@ -263,13 +263,14 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                         }
                         if (weldTypeName == "焊丝" || weldTypeName == "焊条")
                         {
-                            number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : "";
+                            //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : "";
+                            number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "根";
                         }
                         else
                         {
-                            number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "Kg" : "";
+                            //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0#") + "Kg" : "";
+                            number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "Kg";
                         }
-
                         if (!string.IsNullOrEmpty(material.StoreMan))
                         {
                             var store = BLL.StoremanInfoService.GetStoremanById(material.StoreMan);
diff --git a/HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs b/HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
index 5696255..ca377a0 100644
--- a/HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
@@ -10,6 +10,23 @@ namespace FineUIPro.Web.common.ProjectSet
 {
     public partial class SelectWelder : PageBase
     {
+        #region 定义项
+        /// <summary>
+        ///  项目id
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
         #region 加载
         /// <summary>
         /// 加载页面
@@ -20,6 +37,7 @@ namespace FineUIPro.Web.common.ProjectSet
         {
             if (!IsPostBack)
             {
+                this.ProjectId = Request.Params["projectId"];
                 BindGrid();
                 //InitTreeMenu();//加载树
             }
@@ -58,7 +76,7 @@ namespace FineUIPro.Web.common.ProjectSet
                               WHERE WED_ID NOT IN(SELECT WED_ID FROM Project_Welder WHERE ProjectId =@ProjectId)
                                     AND IsOAM=1";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
+            listStr.Add(new SqlParameter("@ProjectId", ProjectId));
             
             if (!string.IsNullOrEmpty(txtWeldCode.Text))
             {
@@ -122,7 +140,7 @@ namespace FineUIPro.Web.common.ProjectSet
                 {
                     Model.Project_Welder newProjectWelder = new Model.Project_Welder();                    
                     newProjectWelder.WED_ID = Grid1.DataKeys[i][0].ToString();
-                    newProjectWelder.ProjectId = Request.Params["projectId"];
+                    newProjectWelder.ProjectId = this.ProjectId;
                     newProjectWelder.IsSelected = true;
                     newProjectWelder.IsApprove = true;
                     newProjectWelder.ProjectWelderId = SQLHelper.GetNewID(typeof(Model.Project_Welder));