From 964908e6140e4591999615b21371aaa81e465f17 Mon Sep 17 00:00:00 2001 From: xusc Date: Thu, 28 Dec 2023 14:00:10 +0800 Subject: [PATCH] .. --- WMS-BS/NFine.Application/OMAY/OMAYApsApp.cs | 5 +++++ WMS-BS/NFine.Web/Areas/OMAY/Views/Aps/MoProducePlan.cshtml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/WMS-BS/NFine.Application/OMAY/OMAYApsApp.cs b/WMS-BS/NFine.Application/OMAY/OMAYApsApp.cs index 59ead3a..bd036d5 100644 --- a/WMS-BS/NFine.Application/OMAY/OMAYApsApp.cs +++ b/WMS-BS/NFine.Application/OMAY/OMAYApsApp.cs @@ -66,6 +66,8 @@ where 1=1 --order by a.CreateDateTime desc ) a where 1=1 + + "; // sql += " WHERE 1=1 and a.MOStatus<>'3' "; //sql = string.Format(sql, Figure); @@ -94,16 +96,19 @@ where 1=1 { sql += " and a.DepName ='" + ssName1 + "' and a.APSStatus='Y' "; sql = sql.Replace("<1>", " "); + } if (!string.IsNullOrEmpty(ssName1)) { sql += " and a.DepName ='" + ssName1 + "' and a.APSStatus='Y' "; sql = sql.Replace("<1>", " "); + } if (!string.IsNullOrEmpty(ssName2)) { sql += " and a.DepName ='" + ssName2 + "' "; sql = sql.Replace("<1>", " and a.APSStatus is null "); + } } //if (!string.IsNullOrWhiteSpace(queryParam["SSName"].ToString())) diff --git a/WMS-BS/NFine.Web/Areas/OMAY/Views/Aps/MoProducePlan.cshtml b/WMS-BS/NFine.Web/Areas/OMAY/Views/Aps/MoProducePlan.cshtml index d39b366..4fb86ec 100644 --- a/WMS-BS/NFine.Web/Areas/OMAY/Views/Aps/MoProducePlan.cshtml +++ b/WMS-BS/NFine.Web/Areas/OMAY/Views/Aps/MoProducePlan.cshtml @@ -202,8 +202,8 @@ } }, pager: "#gridPager", - sortname: 'ApsOrderDate', - sortorder: "desc", + sortname: 'ApsOrderDate,PlanStartDate', + sortorder: "asc", viewrecords: true, multiselect: true, subGrid: true, // (1)开启子表格支持