xusc 11 months ago
parent
commit
964908e614
  1. 5
      WMS-BS/NFine.Application/OMAY/OMAYApsApp.cs
  2. 4
      WMS-BS/NFine.Web/Areas/OMAY/Views/Aps/MoProducePlan.cshtml

5
WMS-BS/NFine.Application/OMAY/OMAYApsApp.cs

@ -66,6 +66,8 @@ where 1=1
--order by a.CreateDateTime desc --order by a.CreateDateTime desc
) a ) a
where 1=1 where 1=1
"; ";
// sql += " WHERE 1=1 and a.MOStatus<>'3' "; // sql += " WHERE 1=1 and a.MOStatus<>'3' ";
//sql = string.Format(sql, Figure); //sql = string.Format(sql, Figure);
@ -94,16 +96,19 @@ where 1=1
{ {
sql += " and a.DepName ='" + ssName1 + "' and a.APSStatus='Y' "; sql += " and a.DepName ='" + ssName1 + "' and a.APSStatus='Y' ";
sql = sql.Replace("<1>", " "); sql = sql.Replace("<1>", " ");
} }
if (!string.IsNullOrEmpty(ssName1)) if (!string.IsNullOrEmpty(ssName1))
{ {
sql += " and a.DepName ='" + ssName1 + "' and a.APSStatus='Y' "; sql += " and a.DepName ='" + ssName1 + "' and a.APSStatus='Y' ";
sql = sql.Replace("<1>", " "); sql = sql.Replace("<1>", " ");
} }
if (!string.IsNullOrEmpty(ssName2)) if (!string.IsNullOrEmpty(ssName2))
{ {
sql += " and a.DepName ='" + ssName2 + "' "; sql += " and a.DepName ='" + ssName2 + "' ";
sql = sql.Replace("<1>", " and a.APSStatus is null "); sql = sql.Replace("<1>", " and a.APSStatus is null ");
} }
} }
//if (!string.IsNullOrWhiteSpace(queryParam["SSName"].ToString())) //if (!string.IsNullOrWhiteSpace(queryParam["SSName"].ToString()))

4
WMS-BS/NFine.Web/Areas/OMAY/Views/Aps/MoProducePlan.cshtml

@ -202,8 +202,8 @@
} }
}, },
pager: "#gridPager", pager: "#gridPager",
sortname: 'ApsOrderDate',
sortorder: "desc",
sortname: 'ApsOrderDate,PlanStartDate',
sortorder: "asc",
viewrecords: true, viewrecords: true,
multiselect: true, multiselect: true,
subGrid: true, // (1)开启子表格支持 subGrid: true, // (1)开启子表格支持

Loading…
Cancel
Save