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;
+            }
+        }
     }
 }

HJGL_DS/FineUIPro.Web/ErrLog.txt

@@ -35,3 +35,26 @@ IP地址:::1
 
 出错时间:11/11/2025 15:17:16
 
+
+错误信息开始=====>
+错误类型:IndexOutOfRangeException
+错误信息:无法找到列 CompileDate。
+错误堆栈:
+   在 System.Data.DataTable.ParseSortString(String sortString)
+   在 System.Data.DataView.CheckSort(String sort)
+   在 System.Data.DataView.set_Sort(String value)
+   在 FineUIPro.Web.PageBase.GetPagedDataTable(Grid Grid1, DataTable tb) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\common\PageBase.cs:行号 328
+   在 FineUIPro.Web.HJGL.MaterialManage.QualityCertificate.BindGrid() 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\HJGL\MaterialManage\QualityCertificate.aspx.cs:行号 63
+   在 FineUIPro.Web.HJGL.MaterialManage.QualityCertificate.Page_Load(Object sender, EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\HJGL\MaterialManage\QualityCertificate.aspx.cs:行号 31
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:12/09/2025 16:42:15
+出错文件:http://localhost:64304/HJGL/MaterialManage/QualityCertificate.aspx
+IP地址:::1
+操作人员:管理员
+
+出错时间:12/09/2025 16:42:15
+

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj

@@ -1136,6 +1136,8 @@
     <Content Include="HJGL\MaterialManage\EWeldRHRecordNew.aspx" />
     <Content Include="HJGL\MaterialManage\EWeldRHRecordNewSelect.aspx" />
     <Content Include="HJGL\MaterialManage\FluxReleaseRecords.aspx" />
+    <Content Include="HJGL\MaterialManage\QualityCertificate.aspx" />
+    <Content Include="HJGL\MaterialManage\QualityCertificateEdit.aspx" />
     <Content Include="HJGL\MaterialManage\SolderBakingRecordProject.aspx" />
     <Content Include="HJGL\MaterialManage\SolderBakingRecordProjectSelect.aspx" />
     <Content Include="HJGL\MaterialManage\WeldingWireRecovery.aspx" />
@@ -5897,6 +5899,20 @@
     <Compile Include="HJGL\MaterialManage\FluxReleaseRecords.aspx.designer.cs">
       <DependentUpon>FluxReleaseRecords.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HJGL\MaterialManage\QualityCertificate.aspx.cs">
+      <DependentUpon>QualityCertificate.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\MaterialManage\QualityCertificate.aspx.designer.cs">
+      <DependentUpon>QualityCertificate.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\MaterialManage\QualityCertificateEdit.aspx.cs">
+      <DependentUpon>QualityCertificateEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\MaterialManage\QualityCertificateEdit.aspx.designer.cs">
+      <DependentUpon>QualityCertificateEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HJGL\MaterialManage\SolderBakingRecordProject.aspx.cs">
       <DependentUpon>SolderBakingRecordProject.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx

@@ -0,0 +1,134 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityCertificate.aspx.cs" Inherits="FineUIPro.Web.HJGL.MaterialManage.QualityCertificate" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>焊材质保书</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style>
+        .customlabel span {
+            color: red;
+           font-weight: bold;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+        <Items>
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊材入库录入" EnableCollapse="true"
+                runat="server" BoxFlex="1" DataKeyNames="QualityCertificateId" AllowCellEditing="true" ClicksToEdit="2"
+                DataIDField="QualityCertificateId" AllowSorting="true" SortField="CompileDate" SortDirection="DESC"
+                OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15" ForceFit="true"
+                OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
+                EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
+                        <Items>
+                            <f:TextBox runat="server" Label="焊材牌号" ID="txtWeldName" EmptyText="输入查询条件" AutoPostBack="true"
+                                OnTextChanged="TextBox_TextChanged" Width="300px" LabelAlign="right">
+                            </f:TextBox>
+                            <f:DropDownList ID="drpWeldType" runat="server" Label="焊材类型" LabelAlign="Right" AutoPostBack="true" EnableEdit="true"
+                                OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="75px">
+                            </f:DropDownList>
+                            <f:TextBox runat="server" Label="批号" ID="txtHeartNo" EmptyText="输入查询条件" AutoPostBack="true"
+                                OnTextChanged="TextBox_TextChanged" Width="300px" LabelAlign="right">
+                            </f:TextBox>
+                            <f:TextBox runat="server" Label="入库自编号" ID="txtWarrantybook" EmptyText="输入查询条件" AutoPostBack="true"
+                                OnTextChanged="TextBox_TextChanged" Width="300px" LabelAlign="right">
+                            </f:TextBox>
+                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                            </f:ToolbarFill>
+                            <f:Button ID="btnNew" Text="增加" Icon="Add" runat="server" OnClick="btnNew_Click">
+                            </f:Button>
+                        </Items>
+                    </f:Toolbar>
+                </Toolbars>
+                <Columns>
+                    <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
+                        TextAlign="Center">
+                        <ItemTemplate>
+                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>
+                    <f:RenderField Width="150px" ColumnID="WeldName" DataField="WeldName" FieldType="String"
+                        HeaderText="焊材牌号" HeaderTextAlign="Center" TextAlign="Center" SortField="WeldName">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="WeldCode" DataField="WeldCode" FieldType="String"
+                        HeaderText="焊材型号" HeaderTextAlign="Center" TextAlign="Center" SortField="WeldCode">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="WeldSpec" DataField="WeldSpec" FieldType="String"
+                        HeaderText="规格" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField> 
+                    <f:RenderField Width="90px" ColumnID="WeldTypeName" DataField="WeldTypeName" FieldType="String"
+                        HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="HeartNo" DataField="HeartNo" FieldType="String"
+                        HeaderText="批号" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="Warrantybook" DataField="Warrantybook" FieldType="String"
+                        HeaderText="入库自编号" HeaderTextAlign="Center" TextAlign="Center" SortField="Warrantybook">
+                    </f:RenderField>
+                    <f:WindowField TextAlign="Center" Width="60px" WindowID="WindowAtt" HeaderText="附件" Text="附件" ToolTip="附件上传查看" 
+                        DataIFrameUrlFields="QualityCertificateId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/WeldMat/QualityCertificate&menuId=19FC40C2-4FDC-44DC-A785-85491BACAC6D"
+                        HeaderTextAlign="Center" />
+                </Columns>
+                <Listeners>
+                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                </Listeners>
+                <PageItems>
+                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                    </f:ToolbarSeparator>
+                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                    </f:ToolbarText>
+                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        <f:ListItem Text="15" Value="15" />
+                        <f:ListItem Text="20" Value="20" />
+                        <f:ListItem Text="25" Value="25" />
+                    </f:DropDownList>
+                </PageItems>
+            </f:Grid>
+        </Items>
+    </f:Panel>
+    <f:Window ID="Window1" Title="编辑焊材质保书" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
+        Width="800px" Height="350px">
+    </f:Window>
+    <f:Window ID="Window2" Title="移库" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
+        Width="1000px" Height="600px">
+    </f:Window>
+        <f:Window ID="Window3" Title="导入焊材入库" Hidden="true" EnableIFrame="true" EnableMaximize="false"
+            Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="600px" Height="280px">
+        </f:Window>
+        <f:Window ID="WindowAtt" Title="附件页面" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" Height="500px">
+    </f:Window>
+    <f:Menu ID="Menu1" runat="server">
+        <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+            runat="server" Text="编辑" Icon="Pencil">
+        </f:MenuButton>
+        <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+            ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete">
+        </f:MenuButton>
+    </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>

HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.cs

@@ -0,0 +1,288 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Data;
+using System.Linq;
+using BLL;
+
+namespace FineUIPro.Web.HJGL.MaterialManage
+{
+    public partial class QualityCertificate : PageBase
+    {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+
+                this.drpWeldType.DataTextField = "WeldTypeName";
+                this.drpWeldType.DataValueField = "WeldTypeId";
+                this.drpWeldType.DataSource = BLL.WeldTypeService.GetWeldTypeList();
+                this.drpWeldType.DataBind();
+                Funs.FineUIPleaseSelect(this.drpWeldType);
+
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT QC.QualityCertificateId,QC.WeldId,QC.Warrantybook,Weld.WeldCode,Weld.WeldName,Weld.WeldSpec,QC.HeartNo,QC.CompileDate,
+                                    WeldType.WeldTypeName
+                              FROM dbo.Weld_QualityCertificate AS QC
+                              LEFT JOIN dbo.Weld_WeldInfo AS Weld ON Weld.WeldId=QC.WeldId
+                              LEFT JOIN dbo.Weld_WeldType AS WeldType ON WeldType.WeldTypeId = Weld.WeldTypeId
+                              WHERE 1=1  ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+
+            if (!string.IsNullOrEmpty(this.txtWeldName.Text.Trim()))
+            {
+                strSql += " AND Weld.WeldName LIKE @WeldName";
+                listStr.Add(new SqlParameter("@WeldName", "%" + this.txtWeldName.Text.Trim() + "%"));
+            }
+            if (drpWeldType.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND Weld.WeldTypeId = @WeldTypeId";
+                listStr.Add(new SqlParameter("@WeldTypeId", drpWeldType.SelectedValue));
+            }
+            if (!string.IsNullOrEmpty(this.txtHeartNo.Text.Trim()))
+            {
+                strSql += " AND QC.HeartNo LIKE @HeartNo";
+                listStr.Add(new SqlParameter("@HeartNo", "%" + this.txtHeartNo.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(this.txtWarrantybook.Text.Trim()))
+            {
+                strSql += " AND QC.Warrantybook LIKE @Warrantybook";
+                listStr.Add(new SqlParameter("@Warrantybook", "%" + this.txtWarrantybook.Text.Trim() + "%"));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 表头过滤
+        protected void Grid1_FilterChange(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 页索引改变事件
+        /// <summary>
+        /// 页索引改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+        #endregion
+
+        #region 排序
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+        #endregion
+
+        #region 分页选择下拉改变事件
+        /// <summary>
+        /// 分页选择下拉改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+        #region 弹出编辑窗口关闭事件
+        /// <summary>
+        /// 弹出编辑窗体关闭事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 增加按钮
+        /// <summary>
+        /// 增加按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_QualityCertificateMenuId, BLL.Const.BtnAdd))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityCertificateEdit.aspx?QualityCertificateId={0}", string.Empty, "编辑 - ")));
+            }
+            else
+            {
+                Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+        #endregion
+
+        #region 编辑
+        /// <summary>
+        /// 双击Grid事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 编辑按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditData()
+        {
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_QualityCertificateMenuId, BLL.Const.BtnModify))
+            {
+                if (Grid1.SelectedRowIndexArray.Length == 0)
+                {
+                    Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                    return;
+                }
+
+                string id = Grid1.SelectedRowID;
+                if (!string.IsNullOrEmpty(id))
+                {
+                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("QualityCertificateEdit.aspx?QualityCertificateId={0}", id, "编辑 - ")));
+                }
+            }
+            else
+            {
+                Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 右键删除事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            this.DeleteData();
+        }
+
+        /// <summary>
+        /// 删除方法
+        /// </summary>
+        private void DeleteData()
+        {
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_QualityCertificateMenuId, BLL.Const.BtnDelete))
+            {
+                if (Grid1.SelectedRowIndexArray.Length == 1)
+                {
+                    string rowID = Grid1.SelectedRowID.ToString();
+                    if (this.judgementDelete(rowID))
+                    {
+                        CommonService.DeleteAttachFileById(rowID);//删除附件
+                        BLL.QualityCertificateService.DeleteQualityCertificate(rowID);
+                        BLL.Sys_LogService.AddLog(BLL.Const.System_7, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除焊材质保书");
+                    }
+                }
+                else
+                {
+                    Alert.ShowInTop("请选择要删除的记录！", MessageBoxIcon.Warning);
+                    return;
+                }
+                this.BindGrid();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+
+            }
+            else
+            {
+                Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+
+        /// <summary>
+        /// 判断是否可删除
+        /// </summary>
+        /// <param name="rowID"></param>
+        /// <param name="isShow"></param>
+        /// <returns></returns>
+        private bool judgementDelete(string rowID)
+        {
+            string content = string.Empty;
+            //var q = from x in Funs.DB.Weld_UsingMat where x.StockInId == rowID select x;
+            //if (q.Count() > 0)
+            //{
+            //    content = "该入库材料已有领用，不能删除！";
+            //}
+            if (string.IsNullOrEmpty(content))
+            {
+                return true;
+            }
+            else
+            {
+                Alert.ShowInTop(content);
+                return false;
+            }
+        }
+        #endregion
+    }
+}

HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificate.aspx.designer.cs

@@ -0,0 +1,213 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.MaterialManage {
+    
+    
+    public partial class QualityCertificate {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// txtWeldName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldName;
+        
+        /// <summary>
+        /// drpWeldType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWeldType;
+        
+        /// <summary>
+        /// txtHeartNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtHeartNo;
+        
+        /// <summary>
+        /// txtWarrantybook 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWarrantybook;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+        
+        /// <summary>
+        /// lblNumber 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+        
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+        
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+        
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+        
+        /// <summary>
+        /// Window3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window3;
+        
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+        
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+        
+        /// <summary>
+        /// btnMenuEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+        
+        /// <summary>
+        /// btnMenuDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}

HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx

@@ -0,0 +1,79 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="QualityCertificateEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.MaterialManage.QualityCertificateEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>编辑焊材质保书</title>
+    <style>
+        .customlabel span {
+            color: red;
+           font-weight: bold;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Form2" runat="server" />
+    <f:Form ID="Form2" ShowBorder="False" BodyPadding="5px" ShowHeader="False" runat="server"
+        RedStarPosition="BeforeText">
+        <Rows>
+            <f:FormRow>
+                <Items>
+                    <f:HiddenField ID="hdWeldId" runat="server">
+                    </f:HiddenField>
+                    <f:HiddenField ID="hdQualityCertificateId" runat="server"></f:HiddenField>
+                </Items>
+            </f:FormRow>
+            <f:FormRow ColumnWidths="45% 5% 50%">
+                <Items>
+                    <f:TextBox ID="txtWeldName" runat="server" Label="焊材牌号" LabelAlign="Right" Readonly="true"
+                         ShowRedStar="true">
+                    </f:TextBox>
+                    <f:Button runat="server" ID="btnSelect" Icon="Find" OnClick="btnSelect_Click" ToolTip="查找焊材信息">
+                    </f:Button>
+                     <f:TextBox ID="txtWeldSpec" runat="server" Label="规格" LabelAlign="Right" Readonly="true">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="drpHeartNo" runat="server" Label="批号" LabelAlign="Right" AutoPostBack="true" EnableEdit="true"
+                                OnSelectedIndexChanged="drpHeartNo_SelectedIndexChanged">
+                            </f:DropDownList>
+                    <f:TextBox ID="txtWeldType" runat="server" Label="类型" LabelAlign="Right" Readonly="true">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items> 
+                    <f:Label runat="server" ID="txtWarrantybook" Label="入库自编号" LabelAlign="Right"></f:Label>
+                    <f:LinkButton ID="UploadAttach2" runat="server" Label="质保书附件" Text="上传和查看" OnClick="btnAttachUrl2_Click"
+                        LabelAlign="Right">
+                    </f:LinkButton>
+                </Items>
+            </f:FormRow>
+        </Rows>
+        <Toolbars>
+            <f:Toolbar ID="Toolbar2" Position="Bottom" ToolbarAlign="Right" runat="server">
+                <Items>
+                    <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="Form2"
+                        OnClick="btnSave_Click">
+                    </f:Button>
+                    <f:Button ID="btnClose" EnablePostBack="false" Text="关闭" runat="server" Icon="SystemClose">
+                    </f:Button>
+                </Items>
+            </f:Toolbar>
+        </Toolbars>
+    </f:Form>
+    <f:Window ID="Window1" Title="查找焊材信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
+        Width="800px" Height="600px">
+    </f:Window>
+    <f:Window ID="Window2" Title="文件上传" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="680px"
+        Height="480px">
+    </f:Window>
+    </form>
+</body>
+</html>

HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.cs

@@ -0,0 +1,216 @@
+using System;
+using System.Linq;
+using BLL;
+
+namespace FineUIPro.Web.HJGL.MaterialManage
+{
+    public partial class QualityCertificateEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string QualityCertificateId
+        {
+            get
+            {
+                return (string)ViewState["QualityCertificateId"];
+            }
+            set
+            {
+                ViewState["QualityCertificateId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                this.QualityCertificateId = Request.Params["QualityCertificateId"];
+                StockInitService.InitHeartNo(this.drpHeartNo, true);
+                if (!string.IsNullOrEmpty(this.QualityCertificateId))
+                {
+                    this.hdQualityCertificateId.Text = this.QualityCertificateId;
+                    Model.Weld_QualityCertificate qc = BLL.QualityCertificateService.GetQualityCertificateByQualityCertificateId(this.QualityCertificateId);
+                    if (qc != null)
+                    {
+                        if (!string.IsNullOrEmpty(qc.WeldId))
+                        {
+                            this.hdWeldId.Text = qc.WeldId;
+                            var weld = BLL.WeldInfoService.GetWeldInfoById(qc.WeldId);
+                            if (weld != null)
+                            {
+                                //this.txtWeldCode.Text = weld.WeldCode;
+                                this.txtWeldName.Text = weld.WeldName;
+                                this.txtWeldSpec.Text = weld.WeldSpec;
+                                if (!string.IsNullOrEmpty(weld.WeldTypeId))
+                                {
+                                    var weldType = BLL.WeldTypeService.GetWeldTypeById(weld.WeldTypeId);
+                                    if (weldType != null)
+                                    {
+                                        this.txtWeldType.Text = weldType.WeldTypeName;
+                                    }
+                                }
+                            }
+                            this.drpHeartNo.SelectedItem.Text = qc.HeartNo;
+                            this.txtWarrantybook.Text = qc.Warrantybook;
+                        }
+                    }
+                }
+                else
+                {
+                    
+                }
+            }
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (this.hdWeldId.Text == string.Empty)
+            {
+                Alert.ShowInTop("请选择焊材牌号！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.drpHeartNo.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择批号！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (string.IsNullOrEmpty(this.hdQualityCertificateId.Text.Trim()))
+            {
+                Alert.ShowInTop("请上传质保书附件！", MessageBoxIcon.Warning);
+                return;
+            }
+            SaveData();
+            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        private void SaveData()
+        {
+            Model.Weld_QualityCertificate qc = new Model.Weld_QualityCertificate();
+            if (!string.IsNullOrEmpty(this.hdWeldId.Text.Trim()))
+            {
+                qc.WeldId = this.hdWeldId.Text.Trim();
+            }
+
+            qc.Warrantybook = this.txtWarrantybook.Text.Trim();
+            //qc.Number = txtNumber.Text.Trim();
+            qc.HeartNo = drpHeartNo.SelectedItem.Text.Trim();
+            qc.Warrantybook = txtWarrantybook.Text.Trim();
+            qc.CompileMan = this.CurrUser.UserId;
+            qc.CompileDate = DateTime.Now;
+            if (!string.IsNullOrEmpty(this.QualityCertificateId))
+            {
+                qc.QualityCertificateId = this.QualityCertificateId;
+                BLL.QualityCertificateService.UpdateQualityCertificate(qc);
+                BLL.Sys_LogService.AddLog(Const.System_7, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "修改焊材质保书");
+            }
+            else
+            {
+                if (string.IsNullOrWhiteSpace(this.hdQualityCertificateId.Text.Trim()))
+                {
+                    qc.QualityCertificateId = SQLHelper.GetNewID(typeof(Model.Weld_QualityCertificate));
+                }
+                else
+                {
+                    qc.QualityCertificateId = this.hdQualityCertificateId.Text.Trim();
+                }
+                BLL.QualityCertificateService.AddQualityCertificate(qc);
+                BLL.Sys_LogService.AddLog(Const.System_7, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "添加焊材质保书");
+            }
+        }
+        #endregion        
+
+        #region 附件上传
+        /// <summary>
+        /// 上传附件资源
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttachUrl2_Click(object sender, EventArgs e)
+        {
+            string edit = "0"; // 表示能打开附件上传窗口，但不能上传附件
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_QualityCertificateMenuId, BLL.Const.BtnSave))
+            {
+                if (string.IsNullOrEmpty(this.hdQualityCertificateId.Text.Trim()))
+                {
+                    this.hdQualityCertificateId.Text = SQLHelper.GetNewID();
+                }
+                edit = "1";
+                PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/WeldMat/QualityCertificate&menuId={1}&edit={2}", this.hdQualityCertificateId.Text, Const.CLGL_QualityCertificateMenuId, edit)));
+            }
+        }
+        #endregion
+
+        #region 查找焊材信息
+        /// <summary>
+        /// 查找焊材信息
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSelect_Click(object sender, EventArgs e)
+        {
+            string window = String.Format("../../WeldMat/Stock/ShowWeldInfo.aspx", "编辑 - ");
+            PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdWeldId.ClientID) + Window1.GetShowReference(window));
+        }
+
+        #region 弹出编辑窗口关闭事件
+        /// <summary>
+        /// 弹出编辑窗体关闭事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.hdWeldId.Text))
+            {
+                var weld = BLL.WeldInfoService.GetWeldInfoById(this.hdWeldId.Text);
+                if (weld != null)
+                {
+                    //this.txtWeldCode.Text = weld.WeldCode;
+                    this.txtWeldName.Text = weld.WeldName;
+                    this.txtWeldSpec.Text = weld.WeldSpec;
+                    if (!string.IsNullOrEmpty(weld.WeldTypeId))
+                    {
+                        var weldType = BLL.WeldTypeService.GetWeldTypeById(weld.WeldTypeId);
+                        if (weldType != null)
+                        {
+                            this.txtWeldType.Text = weldType.WeldTypeName;
+                        }
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #endregion
+
+        protected void drpHeartNo_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.txtWarrantybook.Text = string.Empty;
+            if (this.drpHeartNo.SelectedValue != BLL.Const._Null)
+            {
+                this.txtWarrantybook.Text = this.drpHeartNo.SelectedValue;
+            }
+        }
+    }
+}

HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/QualityCertificateEdit.aspx.designer.cs

@@ -0,0 +1,168 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.MaterialManage {
+    
+    
+    public partial class QualityCertificateEdit {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+        
+        /// <summary>
+        /// hdWeldId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdWeldId;
+        
+        /// <summary>
+        /// hdQualityCertificateId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdQualityCertificateId;
+        
+        /// <summary>
+        /// txtWeldName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldName;
+        
+        /// <summary>
+        /// btnSelect 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSelect;
+        
+        /// <summary>
+        /// txtWeldSpec 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldSpec;
+        
+        /// <summary>
+        /// drpHeartNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpHeartNo;
+        
+        /// <summary>
+        /// txtWeldType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldType;
+        
+        /// <summary>
+        /// txtWarrantybook 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label txtWarrantybook;
+        
+        /// <summary>
+        /// UploadAttach2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.LinkButton UploadAttach2;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+        
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+    }
+}

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/StatisticsSampleTable.aspx

@@ -50,7 +50,7 @@
                 <Items>
                     <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="统计样表" EnableCollapse="true"
                         runat="server" BoxFlex="1" EnableColumnLines="true"  AllowSorting="true"
-                        SortField="ISO_IsoNo" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
+                        SortField="ISO_IsoNo,JOTY_Group,Sort1,Sort2,Sort3,Sort4,Sort5" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
                         IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange">
                         <Columns>
                             <f:RowNumberField />

HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx

@@ -45,7 +45,8 @@
             </f:FormRow>
             <f:FormRow>
                 <Items> 
-                    <f:TextBox ID="txtHeartNo" runat="server" Label="批号" LabelAlign="Right" >
+                    <f:TextBox ID="txtHeartNo" runat="server" Label="批号" LabelAlign="Right" Required="true"
+                        ShowRedStar="true">
                     </f:TextBox>
                     <f:TextBox ID="txtWeldUnit" runat="server" Label="计量单位" LabelAlign="Right" Readonly="true">
                     </f:TextBox>

HJGL_DS/Model/Model.cs

@@ -518,6 +518,9 @@ namespace Model
     partial void InsertWeld_ProjectPlan(Weld_ProjectPlan instance);
     partial void UpdateWeld_ProjectPlan(Weld_ProjectPlan instance);
     partial void DeleteWeld_ProjectPlan(Weld_ProjectPlan instance);
+    partial void InsertWeld_QualityCertificate(Weld_QualityCertificate instance);
+    partial void UpdateWeld_QualityCertificate(Weld_QualityCertificate instance);
+    partial void DeleteWeld_QualityCertificate(Weld_QualityCertificate instance);
     partial void InsertWeld_RecycleMat(Weld_RecycleMat instance);
     partial void UpdateWeld_RecycleMat(Weld_RecycleMat instance);
     partial void DeleteWeld_RecycleMat(Weld_RecycleMat instance);
@@ -2351,6 +2354,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Weld_QualityCertificate> Weld_QualityCertificate
+		{
+			get
+			{
+				return this.GetTable<Weld_QualityCertificate>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Weld_RecycleMat> Weld_RecycleMat
 		{
 			get
@@ -109839,6 +109850,188 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Weld_QualityCertificate")]
+	public partial class Weld_QualityCertificate : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _QualityCertificateId;
+		
+		private string _WeldId;
+		
+		private string _HeartNo;
+		
+		private string _Warrantybook;
+		
+		private string _CompileMan;
+		
+		private System.Nullable<System.DateTime> _CompileDate;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnQualityCertificateIdChanging(string value);
+    partial void OnQualityCertificateIdChanged();
+    partial void OnWeldIdChanging(string value);
+    partial void OnWeldIdChanged();
+    partial void OnHeartNoChanging(string value);
+    partial void OnHeartNoChanged();
+    partial void OnWarrantybookChanging(string value);
+    partial void OnWarrantybookChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompileDateChanged();
+    #endregion
+		
+		public Weld_QualityCertificate()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualityCertificateId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string QualityCertificateId
+		{
+			get
+			{
+				return this._QualityCertificateId;
+			}
+			set
+			{
+				if ((this._QualityCertificateId != value))
+				{
+					this.OnQualityCertificateIdChanging(value);
+					this.SendPropertyChanging();
+					this._QualityCertificateId = value;
+					this.SendPropertyChanged("QualityCertificateId");
+					this.OnQualityCertificateIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldId", DbType="NVarChar(50)")]
+		public string WeldId
+		{
+			get
+			{
+				return this._WeldId;
+			}
+			set
+			{
+				if ((this._WeldId != value))
+				{
+					this.OnWeldIdChanging(value);
+					this.SendPropertyChanging();
+					this._WeldId = value;
+					this.SendPropertyChanged("WeldId");
+					this.OnWeldIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HeartNo", DbType="NVarChar(50)")]
+		public string HeartNo
+		{
+			get
+			{
+				return this._HeartNo;
+			}
+			set
+			{
+				if ((this._HeartNo != value))
+				{
+					this.OnHeartNoChanging(value);
+					this.SendPropertyChanging();
+					this._HeartNo = value;
+					this.SendPropertyChanged("HeartNo");
+					this.OnHeartNoChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Warrantybook", DbType="NVarChar(50)")]
+		public string Warrantybook
+		{
+			get
+			{
+				return this._Warrantybook;
+			}
+			set
+			{
+				if ((this._Warrantybook != value))
+				{
+					this.OnWarrantybookChanging(value);
+					this.SendPropertyChanging();
+					this._Warrantybook = value;
+					this.SendPropertyChanged("Warrantybook");
+					this.OnWarrantybookChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					this.OnCompileManChanging(value);
+					this.SendPropertyChanging();
+					this._CompileMan = value;
+					this.SendPropertyChanged("CompileMan");
+					this.OnCompileManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompileDate
+		{
+			get
+			{
+				return this._CompileDate;
+			}
+			set
+			{
+				if ((this._CompileDate != value))
+				{
+					this.OnCompileDateChanging(value);
+					this.SendPropertyChanging();
+					this._CompileDate = value;
+					this.SendPropertyChanged("CompileDate");
+					this.OnCompileDateChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Weld_RecycleMat")]
 	public partial class Weld_RecycleMat : INotifyPropertyChanging, INotifyPropertyChanged
 	{

HJGL_DS/WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />