liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
dev
liulb@mesnac.com 1 year ago
parent 5339ac6904
commit 4c2c0c0939
7 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File

10
Aucma.Scada.UI/ConvertTo/AssemblyPlan/PlanStatusConverter.cs
Unescape Escape View File

@ -4,9 +4,9 @@ using System.Windows.Data;
namespace Aucma.Scada.UI.ConvertTo.AssemblyPlan 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) if (value == null)
{ {
@ -14,7 +14,7 @@ namespace Aucma.Scada.UI.ConvertTo.AssemblyPlan
} }
else else
{ {
int info = (int)value; int info = (int)value[0];
string result = ""; string result = "";
switch (info) 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(); throw new NotImplementedException();
} }

8
Aucma.Scada.UI/ConvertTo/LinerInventory/StatusLabelConverter.cs
Unescape Escape View File

@ -4,9 +4,9 @@ using System.Windows.Data;
namespace Aucma.Scada.UI.ConvertTo.LinerInventory 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) if (value == null)
{ {
@ -14,7 +14,7 @@ namespace Aucma.Scada.UI.ConvertTo.LinerInventory
} }
else else
{ {
int info = (int)value; int info = (int)value[0];
if (info == 1) 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(); throw new NotImplementedException();
} }

12
Aucma.Scada.UI/ConvertTo/ShellInventory/StatusLabelConverter.cs
Unescape Escape View File

@ -1,14 +1,12 @@
using HighWayIot.Common; using System;
using System;
using System.Globalization; using System.Globalization;
using System.Windows.Data; using System.Windows.Data;
namespace Aucma.Scada.UI.ConvertTo.ShellInventory 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) if (value == null)
{ {
@ -16,7 +14,7 @@ namespace Aucma.Scada.UI.ConvertTo.ShellInventory
} }
else else
{ {
int info = (int)value; int info = (int)value[0];
if (info == 1) 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(); throw new NotImplementedException();
} }

8
Aucma.Scada.UI/ConvertTo/TaskInfo/TaskStatusConverter.cs
Unescape Escape View File

@ -4,9 +4,9 @@ using System.Windows.Data;
namespace Aucma.Scada.UI.ConvertTo.TaskInfo 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) if (value == null)
{ {
@ -14,7 +14,7 @@ namespace Aucma.Scada.UI.ConvertTo.TaskInfo
} }
else else
{ {
int info = (int)value; int info = (int)value[0];
string result = ""; string result = "";
switch (info) 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(); throw new NotImplementedException();
} }

8
Aucma.Scada.UI/ConvertTo/TaskInfo/TaskTypeConverter.cs
Unescape Escape View File

@ -4,9 +4,9 @@ using System.Windows.Data;
namespace Aucma.Scada.UI.ConvertTo.TaskInfo 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) if (value == null)
{ {
@ -14,7 +14,7 @@ namespace Aucma.Scada.UI.ConvertTo.TaskInfo
} }
else else
{ {
int info = (int)value; int info = (int)value[0];
string result = ""; string result = "";
switch (info) 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(); throw new NotImplementedException();
} }

2
Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
Unescape Escape View File

@ -9,7 +9,7 @@
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent"> d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
<Control.Resources> <Control.Resources>
<local1:PlanStatusConverter x:Key="PlanStatusConverter" /> <local1:PlanStatusConverter x:Name="StatusLabelConverter" />
</Control.Resources> </Control.Resources>
<Grid Margin="5,5"> <Grid Margin="5,5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>

14
Aucma.Scada.UI/PlanBusiness/InStoreBusiness.cs
Unescape Escape View File

@ -34,10 +34,10 @@ namespace Aucma.Scada.UI.PlanBusiness
private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(ExecutePlanInfoServices)); private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(ExecutePlanInfoServices));
private AppConfig appConfig = AppConfig.Instance; 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 #endregion
@ -94,11 +94,11 @@ namespace Aucma.Scada.UI.PlanBusiness
_baseBomInfoService = App.ServiceProvider.GetService<IBaseBomInfoServices>(); _baseBomInfoService = App.ServiceProvider.GetService<IBaseBomInfoServices>();
_recordInStore = App.ServiceProvider.GetService<IRecordInStoreServices>(); _recordInStore = App.ServiceProvider.GetService<IRecordInStoreServices>();
taskHandle.InStoreFinsihEvent += InStoreFinish; //taskHandle.InStoreFinsihEvent += InStoreFinish;
taskHandle.InStoreAnswerEvent += InStoreAnswer; //taskHandle.InStoreAnswerEvent += InStoreAnswer;
grabImage.RefreshMaterialCodeStrEvent += InStore; //grabImage.RefreshMaterialCodeStrEvent += InStore;
grabImage.RefreshLogMessageEvent += PrintLogInfoMessage; //grabImage.RefreshLogMessageEvent += PrintLogInfoMessage;
StartPassDown(); StartPassDown();

Write Preview
Loading…
Cancel
Save