材料入库导入增加序号

DataBase/版本日志/SGGLDB_V2024-11-12.sql

@@ -0,0 +1,3 @@
+alter table dbo.Tw_InOutPlanDetail
+    add SortIndex   int
+go

SGGL/BLL/CLGL/TwConst.cs

@@ -45,8 +45,8 @@ namespace BLL
     };
         public static Dictionary<string, int> PlanPrintMap = new Dictionary<string, int>
     {
-        {  "采购通知单" ,(int)TypeInt.采购入库},
+        {  "采购入库申请单" ,(int)TypeInt.采购入库},
-        {  "退料通知单" ,(int)TypeInt.退料入库},
+        {  "退料入库申请单" ,(int)TypeInt.退料入库},
         {  "其他入库通知单" ,(int)TypeInt.其他入库},
         {  "材料领用申请单" ,(int)TypeInt.领料出库},
         {  "补料申请单" ,(int)TypeInt.补料出库},

SGGL/BLL/CLGL/TwInOutplandetailService.cs

@@ -37,6 +37,7 @@ namespace BLL
                               (string.IsNullOrEmpty(table.InOutPlanMasterId) || x.InOutPlanMasterId.Contains(table.InOutPlanMasterId)) &&
                               (string.IsNullOrEmpty(table.PipelineComponentId) || x.PipelineComponentId.Contains(table.PipelineComponentId)) &&
                               (string.IsNullOrEmpty(table.MaterialCode) || x.MaterialCode.Contains(table.MaterialCode))  
+                              orderby x.SortIndex 
                     select new Model.Tw_InOutDetailOutput
                     {
                         Id = x.Id,
@@ -49,7 +50,7 @@ namespace BLL
                         MaterialName = mat.MaterialName,
                         MaterialDef= mat.MaterialDef,
                         StockNum = stock.StockNum ?? 0,
-                    }
+                    } 
                   ;
 
             return q;
@@ -94,6 +95,7 @@ namespace BLL
                 MaterialCode = newtable.MaterialCode,
                 PlanNum = newtable.PlanNum,
                 ActNum = newtable.ActNum,
+                SortIndex = newtable.SortIndex
             };
             Funs.DB.Tw_InOutPlanDetail.InsertOnSubmit(table);
             Funs.DB.SubmitChanges();
@@ -106,11 +108,14 @@ namespace BLL
         /// <param name="inoutPlanMasterId"></param>
         public static void AddList(IEnumerable<Model.Tw_InOutPlanDetail> list, string inoutPlanMasterId)
         {
+            int sortIndex = 1;
             foreach (var item in list)
             {
                 item.Id= SQLHelper.GetNewID();
+                item.SortIndex= sortIndex;
                 item.InOutPlanMasterId = inoutPlanMasterId;
                 Add(item);
+                sortIndex++;
             }
         }
         public static void Update(Model.Tw_InOutPlanDetail newtable)
@@ -125,6 +130,7 @@ namespace BLL
                 table.MaterialCode = newtable.MaterialCode;
                 table.PlanNum = newtable.PlanNum;
                 table.ActNum = newtable.ActNum;
+                table.SortIndex= newtable.SortIndex;
                 Funs.DB.SubmitChanges();
             }
 

SGGL/BLL/CLGL/TwInOutplanmasterService.cs

@@ -43,6 +43,7 @@ namespace BLL
                     from warehouseperson in warehousepersons.DefaultIfEmpty()
                     join unit in Funs.DB.Base_Unit on x.ReqUnitId equals unit.UnitId into units
                     from unit in units.DefaultIfEmpty() 
+                    orderby x.CreateDate descending 
                     where
                               (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
                               (string.IsNullOrEmpty(table.ProjectId) || x.ProjectId.Contains(table.ProjectId)) &&
@@ -157,6 +158,7 @@ namespace BLL
             var result = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize).ToList();
             // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
             return from x in result
+
                    select new Model.Tw_InOutMasterOutput
                    {
                        Id = x.Id,

SGGL/BLL/CLGL/TwInputdetailService.cs

@@ -121,5 +121,24 @@ namespace BLL
 
         }
 
+        public static IEnumerable GePrintListByInputMasterIds(List<string> inputMasterIds)
+        {
+            var q = from x in Funs.DB.Tw_InputDetail
+                join mat in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals mat.MaterialCode into mm
+                from mat in mm.DefaultIfEmpty()
+                join y in Funs.DB.Tw_InputMaster on x.InputMasterId equals y.Id
+                where inputMasterIds.Contains(x.InputMasterId)
+                orderby y.CusBillCode , x.MaterialCode
+                    select new 
+                { 
+                    入库单编号 = y.CusBillCode,
+                    材料编码 = x.MaterialCode,
+                    材料名称 = mat.MaterialName,
+                    材料描述 = mat.MaterialDef,
+                    计划数量 = x.PlanNum,
+                    实际数量 = x.ActNum,
+                };
+            return q;
+        }
     }
 }

SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx

@@ -143,7 +143,14 @@
                                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" 
                                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode"
                                     SortDirection="DESC"  EnableColumnLines="true"  
-                                    AllowPaging="true" IsDatabasePaging="true" PageSize="10000" > 
+                                    AllowPaging="true" IsDatabasePaging="true" PageSize="10000"  EnableTextSelection="True" >
+                                    <Toolbars>
+                                        <f:Toolbar runat="server">
+                                            <Items>
+                                                <f:TextBox runat="server" ID="txtMaterialCode" Label="材料编码" AutoPostBack="True" OnTextChanged="txtMaterialCode_OnTextChanged" LabelWidth="100px" LabelAlign="Right" Width="200px"/>
+                                            </Items>
+                                        </f:Toolbar>
+                                    </Toolbars> 
                                     <Columns>
                                         <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
                                             TextAlign="Center">
@@ -151,8 +158,8 @@
                                                 <asp:Label ID="Label1" runat="server" Text='<%# Grid2.PageIndex * Grid2.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                                             </ItemTemplate>
                                         </f:TemplateField> 
-                                        <f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
+                                        <f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"   
-                                            FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
+                                            FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center" >
                                         </f:RenderField>
                                         <f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
                                             FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">

SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs

@@ -80,6 +80,7 @@ namespace FineUIPro.Web.CLGL
         {
             Model.Tw_InOutDetailOutput table = new Model.Tw_InOutDetailOutput();
             table.InOutPlanMasterId = inOutPlanMasterId;
+            table.MaterialCode = txtMaterialCode.Text; 
             var tb = BLL.TwInOutplandetailService.GetListData(table, Grid2); 
             Grid2.DataSource = tb;
             Grid2.DataBind(); 
@@ -329,7 +330,6 @@ namespace FineUIPro.Web.CLGL
                     this.btnMenuEdit.Hidden = false;
                     this.btnGenInMaster.Hidden = false;
                     this.btnRevokeGenInMaster.Hidden = false;
-                    this.btnPassMaster.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
@@ -438,8 +438,8 @@ namespace FineUIPro.Web.CLGL
                 AuditDate = string.Format("{0:yyyy-MM-dd}", result.AuditDate),
                 AuditManName2 = !string.IsNullOrEmpty(result.AuditMan2) ? BLL.Person_PersonsService.getSignatureUrl(result.AuditMan2) : "",
                 AuditDate2 = string.Format("{0:yyyy-MM-dd}", result.AuditDate2),
-                WarehouseManName = !string.IsNullOrEmpty(result.WarehouseMan) ? BLL.Person_PersonsService.getSignatureUrl(result.WarehouseMan) : "",
+                WarehouseManName = !string.IsNullOrEmpty(result.CreateManName) ? BLL.Person_PersonsService.getSignatureUrl(result.CreateManName) : "",
-                WarehouseManAuditDate = string.Format("{0:yyyy-MM-dd}", result.WarehouseDate),
+                WarehouseManAuditDate = string.Format("{0:yyyy-MM-dd}", result.CreateDate),
             };
             tw_PrintMasters.Add(printMaster);
             //  orderApproveIn.ProjectManager = !string.IsNullOrEmpty(approveManModels.InputApproveMan.ProjectManager) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.InputApproveMan.ProjectManager) : "";
@@ -479,6 +479,7 @@ namespace FineUIPro.Web.CLGL
             var tw_PrintDetail = (        from x in Funs.DB.Tw_InOutPlanDetail
                                           join y in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode 
                                           where x.InOutPlanMasterId==Id
+                                          orderby x.SortIndex
                                           select new Model.Tw_PrintDetail
                                           {
                                               SortIndex =0,
@@ -518,5 +519,9 @@ namespace FineUIPro.Web.CLGL
             }
         }
 
+        protected void txtMaterialCode_OnTextChanged(object sender, EventArgs e)
+        {
+            BindDetailGrid(Grid1.SelectedRowID);
+        }
     }
 }

SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.designer.cs

@@ -221,6 +221,15 @@ namespace FineUIPro.Web.CLGL
         /// </remarks>
         protected global::FineUIPro.Grid Grid2;
 
+        /// <summary>
+        /// txtMaterialCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMaterialCode;
+
         /// <summary>
         /// Label1 控件。
         /// </summary>

SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx

@@ -17,7 +17,7 @@
     <form id="form1" runat="server">
         <div>
             <f:PageManager runat="server" AutoSizePanelID="Form2" />
-            <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="出库单详情"
+            <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="入库单详情"
                 BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
                 <Toolbars>
                     <f:Toolbar ID="TbCreate" Position="Top" ToolbarAlign="Right" runat="server" >
@@ -54,7 +54,7 @@
                         </Items>
                     </f:Panel>  
 
-                    <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="true" Title="出库单列表"
+                    <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="true" Title="入库单列表"
                         runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
                         DataIDField="Id" EnableColumnLines="true" Height="400" EnableBigData="true"  
                         EnableTextSelection="True">

SGGL/FineUIPro.Web/CLGL/InputMaster.aspx

@@ -38,7 +38,7 @@
                                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="出入库计划主表" EnableCollapse="true" ForceFit="true"
                                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
                                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
-                                    SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"
+                                    SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" EnableCheckBoxSelect="True"
                                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick" OnRowCommand="Grid1_RowCommand">
                                     <Toolbars>

SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs

@@ -1,4 +1,5 @@
 using BLL;
+using MiniExcelLibs;
 using Model;
 using System;
 using System.Collections.Generic;
@@ -243,15 +244,26 @@ namespace FineUIPro.Web.CLGL
         /// <param name="e"></param>
         protected void btnOut_Click(object sender, EventArgs e)
         {
-            Response.ClearContent();
+            if (Grid1.SelectedRowIDArray.Length>0)
-            string filename = Funs.GetNewFileName();
+            {
-            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("出入库计划主表" + filename, System.Text.Encoding.UTF8) + ".xls");
+               var printModel= TwInputdetailService.GePrintListByInputMasterIds(Grid1.SelectedRowIDArray.ToList());
-            Response.ContentType = "application/excel";
+                string path = Funs.RootPath + @"File\Excel\Temp\InputDetail.xlsx";
-            Response.ContentEncoding = System.Text.Encoding.UTF8;
+                path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
-            this.Grid1.PageSize = 500;
+
-            this.BindGrid();
+                MiniExcel.SaveAs(path, printModel);
-            Response.Write(GetGridTableHtml(Grid1));
+
-            Response.End();
+                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>

SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx

@@ -35,7 +35,7 @@
                 runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" 
                 ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
                 SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true" EnableTextSelection="True"
-                AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" >
+                AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server"  ToolbarAlign="Left">
                         <Items>

SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx

@@ -165,7 +165,7 @@
                                                 <f:Grid ID="Grid2" ShowBorder="False" ShowHeader="False" Title="出库明细" EnableCollapse="true"  
                                                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
                                                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode"
-                                                    SortDirection="DESC" EnableColumnLines="true"
+                                                    SortDirection="DESC" EnableColumnLines="true" EnableTextSelection="True"
                                                     AllowPaging="true" IsDatabasePaging="true" PageSize="10000">
                                                     <Columns>
 

SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx

@@ -158,7 +158,7 @@
                                                 <f:Grid ID="Grid2" ShowBorder="False" ShowHeader="False" Title="入库申请明细表" EnableCollapse="true"  
                                                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
                                                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode"
-                                                    SortDirection="DESC" EnableColumnLines="true"  
+                                                    SortDirection="DESC" EnableColumnLines="true"  EnableTextSelection="True"
                                                     AllowPaging="true" IsDatabasePaging="true" PageSize="10000">
                                                     <Columns>
                                                         <%--<f:RenderField Width="150px" ColumnID="PipelineComponent" DataField="PipelineComponent" SortField="PipelineComponent"

SGGL/FineUIPro.Web/File/Fastreport/材料入库计划单.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/07/2024 16:12:57" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/12/2024 17:52:38" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -84,7 +84,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREle+zCYpLB66N/WZ+YJ430"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRHMXAe/qW0Qw+G7jVNzqKIC"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
       <Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>
@@ -149,12 +149,12 @@ namespace FastReport
           <TableCell Name="Cell320" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 9pt, style=Bold"/>
         </TableRow>
         <TableRow Name="Row38" Height="49.14">
-          <TableCell Name="Cell321" Border.Lines="All" Text="[Table1.BillName]:[Table1.CusBillCode]" VertAlign="Center" Font="宋体, 10pt" TextFill.Color="Red" ColSpan="4"/>
+          <TableCell Name="Cell321" Border.Lines="All" VertAlign="Center" Font="宋体, 10pt" TextFill.Color="Red" ColSpan="4"/>
           <TableCell Name="Cell322" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
           <TableCell Name="Cell323" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
           <TableCell Name="Cell324" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
           <TableCell Name="Cell325" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
-          <TableCell Name="Cell326" Border.Lines="All" Text="领料单位：[Table1.ReqUnitName]" VertAlign="Center" Font="宋体, 10pt, style=Bold" ColSpan="4"/>
+          <TableCell Name="Cell326" Border.Lines="All" Text="[Table1.BillName]:[Table1.CusBillCode] " VertAlign="Center" Font="宋体, 10pt, style=Bold" ColSpan="4"/>
           <TableCell Name="Cell327" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
           <TableCell Name="Cell328" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
           <TableCell Name="Cell330" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>

SGGL/Model/Model.cs

@@ -259100,6 +259100,8 @@ namespace Model
 		
 		private System.Nullable<decimal> _ActNum;
 		
+		private System.Nullable<int> _SortIndex;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -259116,6 +259118,8 @@ namespace Model
     partial void OnPlanNumChanged();
     partial void OnActNumChanging(System.Nullable<decimal> value);
     partial void OnActNumChanged();
+    partial void OnSortIndexChanging(System.Nullable<int> value);
+    partial void OnSortIndexChanged();
     #endregion
 		
 		public Tw_InOutPlanDetail()
@@ -259243,6 +259247,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
+		public System.Nullable<int> SortIndex
+		{
+			get
+			{
+				return this._SortIndex;
+			}
+			set
+			{
+				if ((this._SortIndex != value))
+				{
+					this.OnSortIndexChanging(value);
+					this.SendPropertyChanging();
+					this._SortIndex = value;
+					this.SendPropertyChanged("SortIndex");
+					this.OnSortIndexChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;