From ff0cc67d870447d2cc2ccf00037532b7fb5672b3 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 22 Jan 2024 10:35:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs | 5 +++-- SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs index acf6f875..c2a01581 100644 --- a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs +++ b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs @@ -30,7 +30,7 @@ namespace BLL public string ReceiveDate { get; set; } public string PlanStartDate { get; set; } - + public string Code { get; set; } } @@ -144,9 +144,10 @@ namespace BLL ReceiveMan = t.PersonName, ReceiveDate = x.ReceiveDate.HasValue ? string.Format("{0:g}", x.ReceiveDate) : "", PlanStartDate = GetMinPlanStartDate(x.PackagingManageId), + Code = x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).Substring(x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).LastIndexOf("-") + 1), }).Distinct(); - return q.ToList(); + return q.OrderByDescending(x => x.Code).ToList(); } } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx index f47fe4ed..ca87a4b8 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx @@ -15,7 +15,7 @@