Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS

HJGL_DS/BLL/BLL.csproj

@@ -218,6 +218,7 @@
     <Compile Include="HJGL\MaterialManage\HJGL_EMaterialRegistService.cs" />
     <Compile Include="HJGL\MaterialManage\HJGL_EMInventoryRecordsService.cs" />
     <Compile Include="HJGL\MaterialManage\HJGL_EWeldRHRecordService.cs" />
+    <Compile Include="HJGL\MaterialManage\QualityCertificateService.cs" />
     <Compile Include="HJGL\MaterialManage\TemperatureAndHumidityProjectService.cs" />
     <Compile Include="HJGL\PersonManage\HJGL_PersonManageService.cs" />
     <Compile Include="HJGL\PersonManage\HJGL_WelderQualifiedProjectService.cs" />

HJGL_DS/BLL/Common/Const.cs

@@ -1682,6 +1682,11 @@ namespace BLL
         #endregion
 
         #region 焊条烘烤记录
+        /// <summary>
+        /// 焊材质保书
+        /// </summary>
+        public const string CLGL_QualityCertificateMenuId = "19FC40C2-4FDC-44DC-A785-85491BACAC6D";
+
         /// <summary>
         /// 焊条烘烤记录
         /// </summary>

HJGL_DS/BLL/HJGL/MaterialManage/QualityCertificateService.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+
+namespace BLL
+{
+    public static class QualityCertificateService
+    {
+        /// <summary>
+        /// 根据焊材质保书Id获取焊材质保书信息
+        /// </summary>
+        /// <param name="qualityCertificateId">焊材质保书Id</param>
+        /// <returns></returns>
+        public static Model.Weld_QualityCertificate GetQualityCertificateByQualityCertificateId(string qualityCertificateId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var QualityCertificate = db.Weld_QualityCertificate.FirstOrDefault(e => e.QualityCertificateId == qualityCertificateId);
+            return QualityCertificate;
+        }
+
+        /// <summary>
+        /// 添加焊材质保书
+        /// </summary>
+        /// <param name="qualityCertificate"></param>
+        public static void AddQualityCertificate(Model.Weld_QualityCertificate qualityCertificate)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Weld_QualityCertificate newQualityCertificate = new Model.Weld_QualityCertificate();
+
+            newQualityCertificate.QualityCertificateId = qualityCertificate.QualityCertificateId;
+            newQualityCertificate.WeldId = qualityCertificate.WeldId;
+            newQualityCertificate.HeartNo = qualityCertificate.HeartNo;
+            newQualityCertificate.Warrantybook = qualityCertificate.Warrantybook;
+            newQualityCertificate.CompileMan = qualityCertificate.CompileMan;
+            newQualityCertificate.CompileDate = qualityCertificate.CompileDate;
+
+            db.Weld_QualityCertificate.InsertOnSubmit(newQualityCertificate);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改焊丝烘烤记录
+        /// </summary>
+        /// <param name="qualityCertificate"></param>
+        public static void UpdateQualityCertificate(Model.Weld_QualityCertificate qualityCertificate)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Weld_QualityCertificate newQualityCertificate = db.Weld_QualityCertificate.First(e => e.QualityCertificateId == qualityCertificate.QualityCertificateId);
+
+            newQualityCertificate.WeldId = qualityCertificate.WeldId;
+            newQualityCertificate.HeartNo = qualityCertificate.HeartNo;
+            newQualityCertificate.Warrantybook = qualityCertificate.Warrantybook;
+            newQualityCertificate.CompileMan = qualityCertificate.CompileMan;
+            newQualityCertificate.CompileDate = qualityCertificate.CompileDate;
+
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 删除焊丝烘烤记录
+        /// </summary>
+        /// <param name="eletrodeId"></param>
+        public static void DeleteQualityCertificate(string qualityCertificateId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Weld_QualityCertificate qualityCertificate = db.Weld_QualityCertificate.First(e => e.QualityCertificateId == qualityCertificateId);
+            db.Weld_QualityCertificate.DeleteOnSubmit(qualityCertificate);
+            db.SubmitChanges();
+        }
+    }
+}

HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Web.UI.WebControls;
 
 namespace BLL
 {
@@ -77,5 +78,45 @@ namespace BLL
         {
             return (from x in Funs.DB.Weld_StockInit where x.WeldId == weldId select x).Count();
         }
+
+        /// <summary>
+        /// 加载批号下拉框
+        /// </summary>
+        /// <param name="dropName"></param>
+        /// <param name="isShowPlease"></param>
+        public static void InitHeartNo(FineUIPro.DropDownList dropName, bool isShowPlease)
+        {
+            dropName.DataValueField = "Value";
+            dropName.DataTextField = "Text";
+            dropName.DataSource = GetHeartNoList();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
+        /// <summary>
+        /// 获取施工部用户
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static ListItem[] GetHeartNoList()
+        {
+            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();
+                ListItem[] lis = new ListItem[ls.Count()];
+                for (int i = 0; i < ls.Count(); i++)
+                {
+                    lis[i] = new ListItem(ls[i].HeartNo ?? "", ls[i].Warrantybook.ToString());
+                }
+                return lis;
+            }
+        }
     }
 }