呼叫相关功能

UserClass/AsyncTcpClient.cs

@@ -25,6 +25,7 @@ using System.Xml.Linq;
 using TouchSocket.Core;
 using TouchSocket.Sockets;
 using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper;
+using static SunlightCentralizedControlManagement_SCCM_.View.MachinesView;
 using static System.Windows.Forms.AxHost;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.TaskbarClock;
@@ -128,7 +129,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                         DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "'").First();
                         drEmployee.BeginEdit();
                         drEmployee["SYSKEY"] = Chart_new.GetValue("SYSKEY").ToString();
-                      //  drEmployee["NAME"] = Chart_new.GetValue("MACHINE").ToString();
+                        //  drEmployee["NAME"] = Chart_new.GetValue("MACHINE").ToString();
                         drEmployee["Groups"] = Chart_new.GetValue("GROUP").ToString();
                         drEmployee["State"] = "802";
                         drEmployee.EndEdit();
@@ -168,11 +169,21 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                     }
                     catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
                 }
-                else if (SYSAPI == "SC830")
+                else if (SYSAPI == "SC827")
                 {
                     try
                     {
+                        DAT = DAT.Substring(DAT.IndexOf("]") + 1);
+                        MainWindowViewModel.Dyelot_CALL = JsonConvert.DeserializeObject<DataTable>(DAT).Copy();//反序列化
+
 
+                    }
+                    catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
+                }//呼叫领料单
+                else if (SYSAPI == "SC830")
+                {
+                    try
+                    {
                         DAT = DAT.Substring(DAT.IndexOf("]") + 1);
                         Dictionary<string, object> _new = new Dictionary<string, object>();//缓存函数                  
                         _new = JsonConvert.DeserializeObject<Dictionary<string, object>>(DAT);//反序列化
@@ -246,7 +257,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                     {
                         DAT = DAT.Substring(DAT.IndexOf("]") + 1);
                         MonitorView.Product_DAT = JsonConvert.DeserializeObject<DataTable>(DAT).Copy();//反序列化
-                       MonitorView.Product_bool=true;
+                        MonitorView.Product_bool = true;
                     }
                     catch (Exception ex) { LogGing.LogGingDATA("[ERR='" + ex + "']=Exception"); MainWindowViewModel.ERR_c++; }
                 }//当前领料单信息

View/MonitorView.xaml

@@ -120,7 +120,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition Width="5"/>
-                <ColumnDefinition/>
+                <ColumnDefinition MinWidth="1200"/>
             </Grid.ColumnDefinitions>
             <DataGrid Grid.Column="2" x:Name="Gridstep" AlternationCount="2" SelectionChanged="Gridstep_SelectionChanged"
                       d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"                         
@@ -128,8 +128,7 @@
                       HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" Background="White"
                       GridLinesVisibility="All" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" BorderBrush="{x:Null}"  
                       CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"    
-                      CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" AllowDrop="False" 
-            HeadersVisibility ="Column" >
+                      CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" CanUserAddRows="False">
                 <DataGrid.RowStyle >
                     <Style TargetType="{x:Type DataGridRow}">
                         <Setter Property="IsHitTestVisible" Value="{Binding DataContext.IsInteractive,

ViewModel/MainWindowViewModel.cs

@@ -73,6 +73,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
         public static DataTable Machines = new DataTable();  //设备表缓存
        // public static DataRow MachinesROW;
         public static DataTable USER_data = new DataTable();
+        public static DataTable Dyelot_CALL = new DataTable();
         public static UserControls.info[] inf = new UserControls.info[999]; //定义总览信息卡
         public static int ERR_c = 0;//错误计数器
         public static bool[] USER_Capacity { set; get; } = new bool[99];
@@ -318,7 +319,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                 /**染机用户信息**/
                 try
                 {
-                    if (Selet_Machines(Machines, "UserInfoStart", "ID='" + i + "'").ToString() == "901")
+                    if ((int)Selet_Machines(Machines, "UserInfoStart", "ID='" + i + "'") == 901)
                     {
                         MainWindow.InfData.Rows.Add(new object[] {
                         Selet_Machines(Machines, "Name", "ID='" + i + "'"),
@@ -333,9 +334,22 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                     }
                 }
                 catch (Exception) { }
+                try
+                {
+                    if ((bool)Selet_Machines(Machines, "CALL", "ID='" + i + "'"))
+                    {
+                        stringQueue.Enqueue(new QueueString
+                        {
+                            ID = i,
+                            DAT = "SC827" + Selet_Machines(Machines, "SYSKEY", "ID='" + i + "'")
+                        });
+                    }
+                }
+                catch (Exception) { }
+
 
-            }
 
+            }
         }
         void Tick_Event_60S()
         {