diff --git a/HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs b/HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs
index b521973..65662e9 100644
--- a/HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs
+++ b/HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs
@@ -123,10 +123,11 @@ namespace BLL
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
                 var ls = (from x in db.Weld_StockIn
-                            select new {
-                                x.HeartNo,
-                                x.Warrantybook
-                            }).Distinct().ToList();
+                          select new
+                          {
+                              x.HeartNo,
+                              x.Warrantybook
+                          }).Distinct().ToList();
                 ListItem[] lis = new ListItem[ls.Count()];
                 for (int i = 0; i < ls.Count(); i++)
                 {
@@ -149,7 +150,7 @@ namespace BLL
                           select new
                           {
                               x.Warrantybook,
-                              x.HeartNo,
+                              HeartNo = x.HeartNo + "," + x.StockInId,
                           }).Distinct().ToList();
                 ListItem[] lis = new ListItem[ls.Count()];
                 for (int i = 0; i < ls.Count(); i++)
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.cs
index 16f7eff..1c176c5 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.cs
@@ -211,7 +211,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
             this.txtWeldType.Text = string.Empty;
             if (this.drpWarrantybook.SelectedValue != BLL.Const._Null)
             {
-                this.txtHeartNo.Text = this.drpWarrantybook.SelectedValue;
+                this.txtHeartNo.Text = this.drpWarrantybook.SelectedValue.Split(',')[0];
                 Model.Weld_StockIn s = (from x in Funs.DB.Weld_StockIn where x.Warrantybook == this.drpWarrantybook.SelectedItem.Text.Trim() select x).FirstOrDefault();
                 if (s != null)
                 {