Merge branch 'master' of http://192.168.0.12:13000/sc/DyeingComputer

DyeingComputer.csproj

@@ -33,7 +33,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>

UserClass/AsyncTcpServer.cs

@@ -74,6 +74,7 @@ namespace DyeingComputer.UserClass
       //  public static readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db";  //数据库路径
         public static async Task Main()
         {
+            NetFwManger.AllowPort(7789, "TCP");//开放7790端口
             NetFwManger.AllowPort(7790,"TCP");//开放7790端口
             TcpService service = new TcpService();
             service.Connecting = (client, e) => { return EasyTask.CompletedTask; };//有客户端正在连接
@@ -112,16 +113,17 @@ namespace DyeingComputer.UserClass
                             //WorkOrder_dat.GetValue("WorkOrder");
 
                             object i = MainWindow.SQLiteHelpers.ExecuteScalar("select * from WorkOrder where WorkOrder = " + WorkOrder_dat.GetValue("WorkOrder").ToString(), null);
-
+                            Dictionary<string, object> Step_new = new Dictionary<string, object>();//缓存函数
+                            Step_new.Add("WorkOrder", WorkOrder_dat.GetValue("WorkOrder").ToString());
+                            Step_new.Add("ReDye", WorkOrder_dat.GetValue("ReDye").ToString());
                             if (i != null)
                             {
-                                client.SendAsync("SC910" + "[" + MainWindowViewModel.S01 + "]" +
-                                WorkOrder_dat.GetValue("WorkOrder").ToString());
+                                client.SendAsync("SC910" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
                             }
                             else
                             {
-                                client.SendAsync("SC810" + "[" + MainWindowViewModel.S01 + "]" +
-                                WorkOrder_dat.GetValue("WorkOrder").ToString()); MainWindowViewModel.TX++;
+                                client.SendAsync("SC810" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
+                                MainWindowViewModel.TX++;
                             }
 
                             MainWindow.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_dat);
@@ -144,15 +146,16 @@ namespace DyeingComputer.UserClass
                             DataTable WorkOrder_dat;
                             WorkOrder_dat = SerializeConvert.JsonDeserializeFromString<DataTable>(SYSDAT);
                             bool dat_w = SQLDATA.WorkOderStep(WorkOrder_dat);
+                            Dictionary<string, object> Step_new = new Dictionary<string, object>();//缓存函数
+                            Step_new.Add("WorkOrder", WorkOrder_dat.Select().First().Field<object>("WorkOrder"));
+                            Step_new.Add("ReDye", WorkOrder_dat.Select().First().Field<object>("ReDye"));
                             if (!dat_w)
                             {
-                                client.SendAsync("SC911" + "[" + MainWindowViewModel.S01 + "]" +
-                                WorkOrder_dat.Select().First().Field<object>("WorkOrder"));
+                                client.SendAsync("SC911" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
                             }
                             else
                             {
-                                client.SendAsync("SC811" + "[" + MainWindowViewModel.S01 + "]" +
-                                WorkOrder_dat.Select().First().Field<object>("WorkOrder"));
+                                client.SendAsync("SC811" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
                                 MainWindowViewModel.TX++;
                             }
                             APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令
@@ -173,8 +176,12 @@ namespace DyeingComputer.UserClass
                             Dictionary<string, object> WorkOrder_dat;
                             WorkOrder_dat = SerializeConvert.JsonDeserializeFromString<Dictionary<string, object>>(SYSDAT);
                             MainWindow.SQLiteHelpers.InsertData("WorkorderSet", WorkOrder_dat);//行插入
-                            client.SendAsync("SC812" + "[" + MainWindowViewModel.S01 + "]" +
-                                WorkOrder_dat.GetValue("WorkOrder").ToString());
+
+                            Dictionary<string, object> Step_new = new Dictionary<string, object>();//缓存函数
+                            Step_new.Add("WorkOrder", WorkOrder_dat.GetValue("WorkOrder").ToString());
+                            Step_new.Add("ReDye", WorkOrder_dat.GetValue("ReDye").ToString());
+
+                            client.SendAsync("SC812" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString());
                             MainWindowViewModel.TX++;
                             APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令
                         }
@@ -892,7 +899,7 @@ namespace DyeingComputer.UserClass
             await service.SetupAsync(new TouchSocketConfig()//载入配置
                 .SetMaxBufferSize(1024 * 1024 * 100)
                 .SetMinBufferSize(1024 * 1024)
-                .SetListenIPHosts(new IPHost[] { new IPHost("tcp://127.0.0.1:7789"), new IPHost(7790) })//同时监听两个地址
+                .SetListenIPHosts(new IPHost[] { new IPHost(7789), new IPHost(7790) })//同时监听两个地址
                 .ConfigureContainer(a =>//容器的配置顺序应该在最前面
                 {
                 })