diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 91c78fe3..aefffb1c 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -69,14 +69,6 @@
..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll
-
- ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll
- True
-
-
- ..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll
- False
-
False
@@ -851,6 +843,33 @@
+
+ {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}
+ 2
+ 4
+ 0
+ primary
+ False
+ True
+
+
+ {00020813-0000-0000-C000-000000000046}
+ 1
+ 6
+ 0
+ primary
+ False
+ True
+
+
+ {00020905-0000-0000-C000-000000000046}
+ 8
+ 4
+ 0
+ primary
+ False
+ False
+
{0002E157-0000-0000-C000-000000000046}
5
diff --git a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
index c2a01581..613be122 100644
--- a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
+++ b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
@@ -121,7 +121,7 @@ namespace BLL
}
return PlanStartDate;
}
- public static List GetPackagingManageList(string projectId, string PackagingCode)
+ public static List GetPackagingManageList(string projectId, string PackagingCode, int pageIndex, int pageSize)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
@@ -147,7 +147,7 @@ namespace BLL
Code = x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).Substring(x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).LastIndexOf("-") + 1),
}).Distinct();
- return q.OrderByDescending(x => x.Code).ToList();
+ return q.OrderByDescending(x => x.Code).Skip(pageIndex * pageSize).Take(pageSize).ToList();
}
}
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 9f5c1b53..351c8cac 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -107,14 +107,6 @@
..\FineUIPro\Reference BLL\Interop.WIA.dll
-
- ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll
- True
-
-
- ..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll
- True
-
False
@@ -14453,6 +14445,24 @@
+
+ {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}
+ 2
+ 4
+ 0
+ primary
+ False
+ True
+
+
+ {00020905-0000-0000-C000-000000000046}
+ 8
+ 4
+ 0
+ primary
+ False
+ True
+
{0002E157-0000-0000-C000-000000000046}
5
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs
index 6a822746..1e440eb3 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs
@@ -66,8 +66,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
//var table = this.GetPagedDataTable(Grid1, tb);
//Grid1.DataSource = table;
//Grid1.DataBind();
- var list= BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim());
- Grid1.RecordCount = list.Count;
+ var list2 = BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim(), 0, 10000);
+ var list = BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim(), this.Grid1.PageIndex, this.Grid1.PageSize);
+ Grid1.RecordCount = list2.Count;
Grid1.DataSource = list;
Grid1.DataBind();
}
@@ -145,13 +146,13 @@ namespace FineUIPro.Web.HJGL.PreDesign
#endregion
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
- if (e.CommandName == "cmd_detail" )
+ if (e.CommandName == "cmd_detail")
{
string id = Grid1.SelectedRowID;
string url = "PackagingManageView.aspx?PackagingManageId={0}";
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format(url, id, "操作 - ")));
}
- else if (e.CommandName== "cmd_print")
+ else if (e.CommandName == "cmd_print")
{
string Id = this.Grid1.SelectedRowID;
Pring(Id);
@@ -219,9 +220,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
string url = string.Empty;
var wpq = BLL.HJGL_PackagingmanageService.GetHJGL_PackagingManageById(id);
if (wpq != null)
- {
- url = "PackagingManageEdit.aspx?PackagingManageId={0}";
-
+ {
+ url = "PackagingManageEdit.aspx?PackagingManageId={0}";
+
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format(url, id, "操作 - ")));
}
}
@@ -429,9 +430,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
if (state != null)
{
- string txt= HJGL_PackagingmanageService.GetState().FirstOrDefault(x => x.Value == state.ToString()).Text;
+ string txt = HJGL_PackagingmanageService.GetState().FirstOrDefault(x => x.Value == state.ToString()).Text;
- return txt;
+ return txt;
}
return "";
}