diff --git a/KanBan/NFine.Application/NFine.Application.csproj b/KanBan/NFine.Application/NFine.Application.csproj
index 30cf7f5..f592ee0 100644
--- a/KanBan/NFine.Application/NFine.Application.csproj
+++ b/KanBan/NFine.Application/NFine.Application.csproj
@@ -38,6 +38,10 @@
4
+
+ False
+ ..\NFine.Web\bin\log4net.dll
+
..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
True
diff --git a/KanBan/NFine.Application/Properties/AssemblyInfo.cs b/KanBan/NFine.Application/Properties/AssemblyInfo.cs
index dafd883..d3693e7 100644
--- a/KanBan/NFine.Application/Properties/AssemblyInfo.cs
+++ b/KanBan/NFine.Application/Properties/AssemblyInfo.cs
@@ -34,3 +34,4 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: log4net.Config.DOMConfigurator(ConfigFile = "log4.xml", Watch = true)]
diff --git a/KanBan/NFine.Application/SRM/WatchPanelApp.cs b/KanBan/NFine.Application/SRM/WatchPanelApp.cs
index 8d2483f..4e0edee 100644
--- a/KanBan/NFine.Application/SRM/WatchPanelApp.cs
+++ b/KanBan/NFine.Application/SRM/WatchPanelApp.cs
@@ -10,11 +10,13 @@ using System.Configuration;
using NFine.Data;
using System.IO;
using System.Linq;
+using Newtonsoft.Json;
namespace NFine.Application.WMS
{
public class WatchPanelApp : RepositoryFactory
{
+ private static log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
string workpoint = ConfigurationManager.ConnectionStrings["WorkPointCode"].ConnectionString;
private static string U9IP = ConfigurationManager.ConnectionStrings["U9connstr"].ConnectionString;
private static string StratTimecfg = ConfigurationManager.ConnectionStrings["StratTime"].ConnectionString;
@@ -1164,35 +1166,39 @@ ORDER BY a.EATTRIBUTE1";
{
THgjd = list.ToArray()
});
-
+ log.Info(JsonConvert.SerializeObject(res));
#region 193库位
- List list193 = res.THgjd.ToList().Where(x => x.Lgort == "193").ToList();//193库位
+ List list193 = res.THgjd.ToList().Where(x => x.Lgort == "193").OrderBy(x => x.Spmon).ToList();//193库位
foreach (GetStoreStatus.ZhgpJd item in list193)
{
dt.Rows.Add(item.Spmon, item.Zbhgh, item.Zbhgs);
}
dtList.Add(dt);
+ log.Info("193:" + JsonConvert.SerializeObject(dt));
#endregion
#region 199库位
- List list199 = res.THgjd.ToList().Where(x => x.Lgort == "199").ToList();//199库位
+ List list199 = res.THgjd.ToList().Where(x => x.Lgort == "199").OrderBy(x => x.Spmon).ToList();//199库位
foreach (GetStoreStatus.ZhgpJd item in list199)
{
dt1.Rows.Add(item.Spmon, item.Zbhgh, item.Zbhgs);
}
dtList.Add(dt1);
+ log.Info("199:" + JsonConvert.SerializeObject(dt1));
#endregion
#region 188库位
- List list188 = res.THgjd.ToList().Where(x => x.Tcode == "ZMM188").ToList();//188库位
+ List list188 = res.THgjd.ToList().Where(x => x.Tcode == "ZMM188").OrderBy(x => x.Spmon).ToList();//188库位
foreach (GetStoreStatus.ZhgpJd item in list188)
{
dt2.Rows.Add(item.Spmon, item.Zbhgh, item.Zbhgs);
}
dtList.Add(dt2);
+ log.Info("ZMM188:" + JsonConvert.SerializeObject(dt2));
#endregion
+ log.Info( JsonConvert.SerializeObject(dtList));
return dtList;
}