diff --git a/Aucma.Scada.UI/ConvertTo/AssemblyPlan/PlanStatusConverter.cs b/Aucma.Scada.UI/ConvertTo/AssemblyPlan/PlanStatusConverter.cs index 25ddb870..0f44b890 100644 --- a/Aucma.Scada.UI/ConvertTo/AssemblyPlan/PlanStatusConverter.cs +++ b/Aucma.Scada.UI/ConvertTo/AssemblyPlan/PlanStatusConverter.cs @@ -4,9 +4,9 @@ using System.Windows.Data; namespace Aucma.Scada.UI.ConvertTo.AssemblyPlan { - public class PlanStatusConverter : IValueConverter + public class PlanStatusConverter : IMultiValueConverter { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + public object Convert(object[] value, Type targetType, object parameter, CultureInfo culture) { if (value == null) { @@ -14,7 +14,7 @@ namespace Aucma.Scada.UI.ConvertTo.AssemblyPlan } else { - int info = (int)value; + int info = (int)value[0]; string result = ""; switch (info) { @@ -34,7 +34,9 @@ namespace Aucma.Scada.UI.ConvertTo.AssemblyPlan } } - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + + + public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) { throw new NotImplementedException(); } diff --git a/Aucma.Scada.UI/ConvertTo/LinerInventory/StatusLabelConverter.cs b/Aucma.Scada.UI/ConvertTo/LinerInventory/StatusLabelConverter.cs index 45d8dabf..a7d2d867 100644 --- a/Aucma.Scada.UI/ConvertTo/LinerInventory/StatusLabelConverter.cs +++ b/Aucma.Scada.UI/ConvertTo/LinerInventory/StatusLabelConverter.cs @@ -4,9 +4,9 @@ using System.Windows.Data; namespace Aucma.Scada.UI.ConvertTo.LinerInventory { - public class StatusLabelConverter : IValueConverter + public class StatusLabelConverter : IMultiValueConverter { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + public object Convert(object[] value, Type targetType, object parameter, CultureInfo culture) { if (value == null) { @@ -14,7 +14,7 @@ namespace Aucma.Scada.UI.ConvertTo.LinerInventory } else { - int info = (int)value; + int info = (int)value[0]; if (info == 1) { @@ -28,7 +28,7 @@ namespace Aucma.Scada.UI.ConvertTo.LinerInventory } - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) { throw new NotImplementedException(); } diff --git a/Aucma.Scada.UI/ConvertTo/ShellInventory/StatusLabelConverter.cs b/Aucma.Scada.UI/ConvertTo/ShellInventory/StatusLabelConverter.cs index b749ebed..81675be4 100644 --- a/Aucma.Scada.UI/ConvertTo/ShellInventory/StatusLabelConverter.cs +++ b/Aucma.Scada.UI/ConvertTo/ShellInventory/StatusLabelConverter.cs @@ -1,14 +1,12 @@ -using HighWayIot.Common; -using System; +using System; using System.Globalization; using System.Windows.Data; namespace Aucma.Scada.UI.ConvertTo.ShellInventory { - public class StatusLabelConverter : IValueConverter + public class StatusLabelConverter : IMultiValueConverter { - private StringChange stringChange = StringChange.Instance; - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + public object Convert(object[] value, Type targetType, object parameter, CultureInfo culture) { if (value == null) { @@ -16,7 +14,7 @@ namespace Aucma.Scada.UI.ConvertTo.ShellInventory } else { - int info = (int)value; + int info = (int)value[0]; if (info == 1) { @@ -30,7 +28,7 @@ namespace Aucma.Scada.UI.ConvertTo.ShellInventory } - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture) { throw new NotImplementedException(); } diff --git a/Aucma.Scada.UI/ConvertTo/TaskInfo/TaskStatusConverter.cs b/Aucma.Scada.UI/ConvertTo/TaskInfo/TaskStatusConverter.cs index 0d922e25..05e26dba 100644 --- a/Aucma.Scada.UI/ConvertTo/TaskInfo/TaskStatusConverter.cs +++ b/Aucma.Scada.UI/ConvertTo/TaskInfo/TaskStatusConverter.cs @@ -4,9 +4,9 @@ using System.Windows.Data; namespace Aucma.Scada.UI.ConvertTo.TaskInfo { - public class TaskStatusConverter : IValueConverter + public class TaskStatusConverter : IMultiValueConverter { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + public object Convert(object[] value, Type targetType, object parameter, CultureInfo culture) { if (value == null) { @@ -14,7 +14,7 @@ namespace Aucma.Scada.UI.ConvertTo.TaskInfo } else { - int info = (int)value; + int info = (int)value[0]; string result = ""; switch (info) { @@ -34,7 +34,7 @@ namespace Aucma.Scada.UI.ConvertTo.TaskInfo } } - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture) { throw new NotImplementedException(); } diff --git a/Aucma.Scada.UI/ConvertTo/TaskInfo/TaskTypeConverter.cs b/Aucma.Scada.UI/ConvertTo/TaskInfo/TaskTypeConverter.cs index 3c84d0aa..d9e0e89b 100644 --- a/Aucma.Scada.UI/ConvertTo/TaskInfo/TaskTypeConverter.cs +++ b/Aucma.Scada.UI/ConvertTo/TaskInfo/TaskTypeConverter.cs @@ -4,9 +4,9 @@ using System.Windows.Data; namespace Aucma.Scada.UI.ConvertTo.TaskInfo { - public class TaskTypeConverter : IValueConverter + public class TaskTypeConverter : IMultiValueConverter { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + public object Convert(object[] value, Type targetType, object parameter, CultureInfo culture) { if (value == null) { @@ -14,7 +14,7 @@ namespace Aucma.Scada.UI.ConvertTo.TaskInfo } else { - int info = (int)value; + int info = (int)value[0]; string result = ""; switch (info) { @@ -31,7 +31,7 @@ namespace Aucma.Scada.UI.ConvertTo.TaskInfo } } - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture) { throw new NotImplementedException(); } diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml index 5108e472..5c7c5b4f 100644 --- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml +++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml @@ -9,7 +9,7 @@ mc:Ignorable="d" d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent"> - + diff --git a/Aucma.Scada.UI/PlanBusiness/InStoreBusiness.cs b/Aucma.Scada.UI/PlanBusiness/InStoreBusiness.cs index 05fd0ae6..02984be7 100644 --- a/Aucma.Scada.UI/PlanBusiness/InStoreBusiness.cs +++ b/Aucma.Scada.UI/PlanBusiness/InStoreBusiness.cs @@ -34,10 +34,10 @@ namespace Aucma.Scada.UI.PlanBusiness private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(ExecutePlanInfoServices)); private AppConfig appConfig = AppConfig.Instance; + //?????????????????????????????? + //private InStoreTaskHandle taskHandle = InStoreTaskHandle.Instance; - private InStoreTaskHandle taskHandle = InStoreTaskHandle.Instance; - - private GrabImage grabImage = GrabImage.Instance; + //private GrabImage grabImage = GrabImage.Instance; #endregion @@ -94,11 +94,11 @@ namespace Aucma.Scada.UI.PlanBusiness _baseBomInfoService = App.ServiceProvider.GetService(); _recordInStore = App.ServiceProvider.GetService(); - taskHandle.InStoreFinsihEvent += InStoreFinish; - taskHandle.InStoreAnswerEvent += InStoreAnswer; + //taskHandle.InStoreFinsihEvent += InStoreFinish; + //taskHandle.InStoreAnswerEvent += InStoreAnswer; - grabImage.RefreshMaterialCodeStrEvent += InStore; - grabImage.RefreshLogMessageEvent += PrintLogInfoMessage; + //grabImage.RefreshMaterialCodeStrEvent += InStore; + //grabImage.RefreshLogMessageEvent += PrintLogInfoMessage; StartPassDown();