|
|
|
@ -22,6 +22,7 @@ using Admin.Core.Model;
|
|
|
|
|
using System.Threading;
|
|
|
|
|
using Aucma.Core.HwPLc;
|
|
|
|
|
using Admin.Core.Model.ViewModels;
|
|
|
|
|
using System.Windows;
|
|
|
|
|
|
|
|
|
|
namespace Aucma.Core.BoxFoam.ViewModels
|
|
|
|
|
{
|
|
|
|
@ -84,17 +85,20 @@ namespace Aucma.Core.BoxFoam.ViewModels
|
|
|
|
|
{
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
if (ProductionHourList!=null && ProductionHourList.Count>0)
|
|
|
|
|
Application.Current.Dispatcher.Invoke(() =>
|
|
|
|
|
{
|
|
|
|
|
ProductionHourList.Clear();
|
|
|
|
|
}
|
|
|
|
|
ProductionHourList = new List<string>();
|
|
|
|
|
|
|
|
|
|
List<string> xList = new List<string>();
|
|
|
|
|
List<WorkTime> listTime = _baseBomInfoServices.getWorkTime().Result;
|
|
|
|
|
foreach (WorkTime time in listTime)
|
|
|
|
|
{
|
|
|
|
|
ProductionHourList.Add(time.hourTime);
|
|
|
|
|
xList.Add(time.hourTime);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//if (ProductionHourList != null && ProductionHourList.Count > 0)
|
|
|
|
|
//{
|
|
|
|
|
// ProductionHourList.Clear();
|
|
|
|
|
//}
|
|
|
|
|
ProductionHourList = xList;
|
|
|
|
|
// 货道列表
|
|
|
|
|
List<BoxFoamData> list = _boxFoamDataServices.QueryAsync(x => x.ProductLineCode.Equals("CX_02") && x.StationCode == "1005").Result;
|
|
|
|
|
|
|
|
|
@ -176,9 +180,9 @@ namespace Aucma.Core.BoxFoam.ViewModels
|
|
|
|
|
|
|
|
|
|
#endregion
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
{
|
|
|
|
|