1

.gitignore

@@ -38,3 +38,4 @@ bin-release/
 /HJGL_DS/FineUIPro.Web/ErrLog.txt
 /HJGL_DS/Model/packages.config
 /CreateModel2017.bat
+*.xls

HJGL_DS/BLL/WeldMat/Stock/StockInitService.cs

@@ -97,7 +97,24 @@ namespace BLL
         }
 
         /// <summary>
-        /// 获取施工部用户
+        /// 加载入库自编号下拉框
+        /// </summary>
+        /// <param name="dropName"></param>
+        /// <param name="isShowPlease"></param>
+        public static void InitWarrantybook(FineUIPro.DropDownList dropName, bool isShowPlease)
+        {
+            dropName.DataValueField = "Value";
+            dropName.DataTextField = "Text";
+            dropName.DataSource = GetWarrantybookList();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
+        /// <summary>
+        /// 获取批号
         /// </summary>
         /// <param name="projectId"></param>
         /// <returns></returns>
@@ -118,5 +135,29 @@ namespace BLL
                 return lis;
             }
         }
+
+        /// <summary>
+        /// 获取入库自编号
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static ListItem[] GetWarrantybookList()
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var ls = (from x in db.Weld_StockIn
+                          select new
+                          {
+                              x.Warrantybook,
+                              x.HeartNo,
+                          }).Distinct().ToList();
+                ListItem[] lis = new ListItem[ls.Count()];
+                for (int i = 0; i < ls.Count(); i++)
+                {
+                    lis[i] = new ListItem(ls[i].Warrantybook ?? "", ls[i].HeartNo.ToString());
+                }
+                return lis;
+            }
+        }
     }
 }

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

@@ -66,12 +66,12 @@
                     <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:RenderField Width="120px" ColumnID="HeartNo" DataField="HeartNo" FieldType="String"
+                        HeaderText="批号" HeaderTextAlign="Center" TextAlign="Center">
+                    </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" />

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

@@ -38,8 +38,8 @@
             </f:FormRow>
             <f:FormRow>
                 <Items>
-                    <f:DropDownList ID="drpHeartNo" runat="server" Label="批号" LabelAlign="Right" AutoPostBack="true" EnableEdit="true"
+                    <f:DropDownList ID="drpWarrantybook" runat="server" Label="入库自编号" LabelAlign="Right" AutoPostBack="true" EnableEdit="true"
-                                OnSelectedIndexChanged="drpHeartNo_SelectedIndexChanged">
+                                OnSelectedIndexChanged="drpWarrantybook_SelectedIndexChanged">
                             </f:DropDownList>
                     <f:TextBox ID="txtWeldType" runat="server" Label="类型" LabelAlign="Right" Readonly="true">
                     </f:TextBox>
@@ -47,7 +47,7 @@
             </f:FormRow>
             <f:FormRow>
                 <Items> 
-                    <f:Label runat="server" ID="txtWarrantybook" Label="入库自编号" LabelAlign="Right"></f:Label>
+                    <f:Label runat="server" ID="txtHeartNo" Label="批号" LabelAlign="Right"></f:Label>
                     <f:LinkButton ID="UploadAttach2" runat="server" Label="质保书附件" Text="上传和查看" OnClick="btnAttachUrl2_Click"
                         LabelAlign="Right">
                     </f:LinkButton>

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

@@ -35,7 +35,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 this.QualityCertificateId = Request.Params["QualityCertificateId"];
-                StockInitService.InitHeartNo(this.drpHeartNo, true);
+                StockInitService.InitHeartNo(this.drpWarrantybook, true);
                 if (!string.IsNullOrEmpty(this.QualityCertificateId))
                 {
                     this.hdQualityCertificateId.Text = this.QualityCertificateId;
@@ -60,8 +60,8 @@ namespace FineUIPro.Web.HJGL.MaterialManage
                                     }
                                 }
                             }
-                            this.drpHeartNo.SelectedItem.Text = qc.HeartNo;
+                            this.drpWarrantybook.SelectedItem.Text = qc.Warrantybook;
-                            this.txtWarrantybook.Text = qc.Warrantybook;
+                            this.txtHeartNo.Text = qc.HeartNo;
                         }
                     }
                 }
@@ -86,9 +86,9 @@ namespace FineUIPro.Web.HJGL.MaterialManage
                 Alert.ShowInTop("请选择焊材牌号！", MessageBoxIcon.Warning);
                 return;
             }
-            if (this.drpHeartNo.SelectedValue == BLL.Const._Null)
+            if (this.drpWarrantybook.SelectedValue == BLL.Const._Null)
             {
-                Alert.ShowInTop("请选择批号！", MessageBoxIcon.Warning);
+                Alert.ShowInTop("请选择入库自编号！", MessageBoxIcon.Warning);
                 return;
             }
             if (string.IsNullOrEmpty(this.hdQualityCertificateId.Text.Trim()))
@@ -112,10 +112,9 @@ namespace FineUIPro.Web.HJGL.MaterialManage
                 qc.WeldId = this.hdWeldId.Text.Trim();
             }
 
-            qc.Warrantybook = this.txtWarrantybook.Text.Trim();
+            qc.Warrantybook = drpWarrantybook.SelectedItem.Text.Trim();
             //qc.Number = txtNumber.Text.Trim();
-            qc.HeartNo = drpHeartNo.SelectedItem.Text.Trim();
+            qc.HeartNo = this.txtHeartNo.Text.Trim();
-            qc.Warrantybook = txtWarrantybook.Text.Trim();
             qc.CompileMan = this.CurrUser.UserId;
             qc.CompileDate = DateTime.Now;
             if (!string.IsNullOrEmpty(this.QualityCertificateId))
@@ -204,12 +203,12 @@ namespace FineUIPro.Web.HJGL.MaterialManage
 
         #endregion
 
-        protected void drpHeartNo_SelectedIndexChanged(object sender, EventArgs e)
+        protected void drpWarrantybook_SelectedIndexChanged(object sender, EventArgs e)
         {
-            this.txtWarrantybook.Text = string.Empty;
+            this.txtHeartNo.Text = string.Empty;
-            if (this.drpHeartNo.SelectedValue != BLL.Const._Null)
+            if (this.drpWarrantybook.SelectedValue != BLL.Const._Null)
             {
-                this.txtWarrantybook.Text = this.drpHeartNo.SelectedValue;
+                this.txtHeartNo.Text = this.drpWarrantybook.SelectedValue;
             }
         }
     }

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

@@ -85,13 +85,13 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         protected global::FineUIPro.TextBox txtWeldSpec;
         
         /// <summary>
-        /// drpHeartNo 控件。
+        /// drpWarrantybook 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpHeartNo;
+        protected global::FineUIPro.DropDownList drpWarrantybook;
         
         /// <summary>
         /// txtWeldType 控件。
@@ -103,13 +103,13 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         protected global::FineUIPro.TextBox txtWeldType;
         
         /// <summary>
-        /// txtWarrantybook 控件。
+        /// txtHeartNo 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Label txtWarrantybook;
+        protected global::FineUIPro.Label txtHeartNo;
         
         /// <summary>
         /// UploadAttach2 控件。

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx

@@ -66,6 +66,8 @@
                                 </f:Button>
                                 <f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd" runat="server" OnClick="btnBatchAdd_Click">
                                 </f:Button>
+                                <f:Button ID="btnBatchDel" Text="批量删除" Icon="Delete" runat="server" OnClick="btnBatchDel_Click">
+                                </f:Button>
                                 <f:Button ID="btnOut" runat="server" Text="导出" Icon="FolderUp" OnClick="btnOut_Click">
                                 </f:Button>
                                 <f:Button ID="btnFileName" Text="文档名" Icon="TableEdit" runat="server" OnClick="btnFileName_Click">

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs

@@ -1317,5 +1317,74 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             }
         }
         #endregion
+
+        /// <summary>
+        /// 批量增加焊口信息
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnBatchDel_Click(object sender, EventArgs e)
+        {
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnDelete))
+            {
+                if (Grid1.SelectedRowIndexArray.Length == 0)
+                {
+                    Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
+                    return;
+                }
+
+                bool isShow = true;
+                if (Grid1.SelectedRowIndexArray.Length > 1)
+                {
+                    isShow = false;
+                }
+                string err = string.Empty;
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    string content = judgementDelete(rowID, isShow);
+                    if (string.IsNullOrEmpty(content))
+                    {
+                        Model.SGGLDB db = Funs.DB;
+                        var hotProessTrustItem = db.HJGL_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == rowID);
+                        if (hotProessTrustItem != null)
+                        {
+                            db.HJGL_CH_HotProessTrustItem.DeleteOnSubmit(hotProessTrustItem);
+                        }
+                        var hotProessItem = db.HJGL_HotProessItem.FirstOrDefault(x => x.JOT_ID == rowID);
+                        if (hotProessItem != null)
+                        {
+                            db.HJGL_HotProessItem.DeleteOnSubmit(hotProessItem);
+                        }
+                        var hotProessResult = db.HJGL_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == rowID);
+                        if (hotProessResult != null)
+                        {
+                            db.HJGL_CH_HotProessResult.DeleteOnSubmit(hotProessResult);
+                        }
+                        db.SubmitChanges();
+                        BLL.HJGL_BO_BatchDetailService.DeleteBatchDetail(rowID);  //删除批明细
+                        BLL.HJGL_PW_JointInfoService.DeleteJointInfo(rowID);
+                        BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除焊口信息");
+                    }
+                    else
+                    {
+                        err += content;
+                    }
+                }
+                if (string.IsNullOrEmpty(err))
+                {
+                    Alert.ShowInTop("删除成功！", MessageBoxIcon.Success);
+                }
+                else
+                {
+                    Alert.ShowInTop(err, MessageBoxIcon.Warning);
+                }
+                this.BindGrid();
+            }
+            else
+            {
+                ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+            }
+        }
     }
 }

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.designer.cs

@@ -174,6 +174,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// </remarks>
         protected global::FineUIPro.Button btnBatchAdd;
         
+        /// <summary>
+        /// btnBatchDel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnBatchDel;
+        
         /// <summary>
         /// btnOut 控件。
         /// </summary>

HJGL_DS/FineUIPro.Web/Login.aspx.cs

@@ -57,7 +57,9 @@ namespace FineUIPro.Web
             string password = this.tbxPassword.Text;
             bool rememberMe = this.savemessgae.Checked;
             bool isLogin = false;
-            var sysUser = Funs.DB.Sys_User.FirstOrDefault(x => x.Account == userName && x.IsPost == true);
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var sysUser = db.Sys_User.FirstOrDefault(x => x.Account == userName && x.IsPost == true);
                 if (sysUser != null)
                 {
                     if (sysUser.LockTime.HasValue && sysUser.LockTime.Value > DateTime.Now)
@@ -122,6 +124,7 @@ namespace FineUIPro.Web
                     return;
                 }
             }
+        }
 
         /// <summary>
         /// APP 下载