feat: 完善焊接质量检查和材料管理

补齐焊前专项审核和焊缝外观检测流程，统一质检查询、附件处理与材料明细导出，提升业务数据追溯和组件匹配使用效率。
2026-08-10 17:58:55 +08:00
parent bd73295ff8
commit 2de696fad2
48 changed files with 2252 additions and 131 deletions
@@ -90,6 +90,9 @@
                        <f:RenderField Width="90px" ColumnID="RealNum" DataField="RealNum" SortField="RealNum"
                            FieldType="String" HeaderText="到货量" TextAlign="Left" HeaderTextAlign="Center">
                        </f:RenderField>
+                        <f:RenderField Width="90px" ColumnID="OutputNum" DataField="OutputNum" SortField="OutputNum"
+                            FieldType="String" HeaderText="出库量" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
                        <f:RenderField Width="90px" ColumnID="StockNum" DataField="StockNum" SortField="StockNum"
                            FieldType="String" HeaderText="库存量" TextAlign="Left" HeaderTextAlign="Center">
                        </f:RenderField>
@@ -57,7 +57,7 @@
                                                <f:ToolbarFill runat="server"></f:ToolbarFill>
                                                <f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" Text="查询" OnClick="btnSearch_Click">
                                                </f:Button>
-                                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
+                                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="入库明细导出" ToolTip="导出选中入库单的全部明细" Icon="FolderUp"
                                                    EnableAjax="false" DisableControlBeforePostBack="false">
                                                </f:Button>
                                            </Items>
@@ -266,26 +266,29 @@ namespace FineUIPro.Web.CLGL
        /// <param name="e"></param>
        protected void btnOut_Click(object sender, EventArgs e)
        {
-            if (Grid1.SelectedRowIDArray.Length > 0)
+            if (Grid1.SelectedRowIDArray.Length == 0)
            {
-                var printModel = TwInputdetailService.GePrintListByInputMasterIds(Grid1.SelectedRowIDArray.ToList());
-                string path = Funs.RootPath + @"File\Excel\Temp\InputDetail.xlsx";
-                path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
-
-                MiniExcel.SaveAs(path, printModel);
-
-                string fileName = "入库明细表.xlsx";
-                FileInfo info = new FileInfo(path);
-                long fileSize = info.Length;
-                System.Web.HttpContext.Current.Response.Clear();
-                System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
-                System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
-                System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
-                System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize);
-                System.Web.HttpContext.Current.Response.Flush();
-                System.Web.HttpContext.Current.Response.Close();
-                File.Delete(path);
+                Alert.ShowInTop("请至少选择一张入库单", MessageBoxIcon.Warning);
+                return;
            }
+
+            var printModel = TwInputdetailService.GePrintListByInputMasterIds(Grid1.SelectedRowIDArray.ToList());
+            string path = Funs.RootPath + @"File\Excel\Temp\InputDetail.xlsx";
+            path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
+
+            MiniExcel.SaveAs(path, printModel);
+
+            string fileName = "入库明细表.xlsx";
+            FileInfo info = new FileInfo(path);
+            long fileSize = info.Length;
+            System.Web.HttpContext.Current.Response.Clear();
+            System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
+            System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize);
+            System.Web.HttpContext.Current.Response.Flush();
+            System.Web.HttpContext.Current.Response.Close();
+            File.Delete(path);
        }

        /// <summary>
@@ -225,8 +225,7 @@ namespace FineUIPro.Web.CLGL
            string filename = Funs.GetNewFileName();
            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("材料库存表" + filename, System.Text.Encoding.UTF8) + ".xls");
            Response.ContentType = "application/excel";
-            Response.ContentEncoding = System.Text.Encoding.UTF8;
-            this.Grid1.PageSize = 500;
+            Response.ContentEncoding = System.Text.Encoding.UTF8; 
            this.BindGrid();
            Response.Write(GetGridTableHtml(Grid1));
            Response.End();
@@ -87,7 +87,7 @@
                                        </f:Button>
                                        <f:Button ID="btnGenOutPlanMaster" Text="生成补料申请单" Icon="ArrowRefresh" runat="server" OnClick="btnGenOutPlanMaster_Click" Hidden="true">
                                        </f:Button> 
-                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="出库明细导出" ToolTip="导出选中出库单的全部明细" Icon="FolderUp"
                                                  EnableAjax="false" DisableControlBeforePostBack="false">
                                        </f:Button>
                                    </Items>
@@ -97,6 +97,7 @@
                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="申请单"
                                    EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="Id" PageSize="1000"
                                    AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="Id"
+                                    EnableCheckBoxSelect="true"
                                    AllowSorting="true" SortField="CusBillCode" SortDirection="ASC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand"
                                    EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick">
                                    <Columns>
@@ -672,30 +672,29 @@ namespace FineUIPro.Web.CLGL

        protected void btnOut_Click(object sender, EventArgs e)
        {
-            if (Grid1.SelectedRowIDArray.Length > 0)
+            if (Grid1.SelectedRowIDArray.Length == 0)
            {
-                var sheets = new Dictionary<string, object>
-                {
-                    ["出库明细"] = TwOutputdetailService.GetPrintListByOutputMasterIds(Grid1.SelectedRowIDArray.ToList()),
-                    ["管线材料明细"] = TwInoutplandetailRelationService.GetPrintListByOutputMasterIds(Grid1.SelectedRowIDArray.ToList())
-                };
-                string path = Funs.RootPath + @"File\Excel\Temp\OutputDetail.xlsx";
-                path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
-
-                MiniExcel.SaveAs(path, sheets);
-
-                string fileName = "出库明细表.xlsx";
-                FileInfo info = new FileInfo(path);
-                long fileSize = info.Length;
-                System.Web.HttpContext.Current.Response.Clear();
-                System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
-                System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
-                System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
-                System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize);
-                System.Web.HttpContext.Current.Response.Flush();
-                System.Web.HttpContext.Current.Response.Close();
-                File.Delete(path);
+                Alert.ShowInTop("请至少选择一张出库单", MessageBoxIcon.Warning);
+                return;
            }
+
+            var printModel = TwOutputdetailService.GetPrintListByOutputMasterIds(Grid1.SelectedRowIDArray.ToList());
+            string path = Funs.RootPath + @"File\Excel\Temp\OutputDetail.xlsx";
+            path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
+
+            MiniExcel.SaveAs(path, printModel);
+
+            string fileName = "出库明细表.xlsx";
+            FileInfo info = new FileInfo(path);
+            long fileSize = info.Length;
+            System.Web.HttpContext.Current.Response.Clear();
+            System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
+            System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize);
+            System.Web.HttpContext.Current.Response.Flush();
+            System.Web.HttpContext.Current.Response.Close();
+            File.Delete(path);
        }
    }
 }