change-成品下线界面修改

Aucma.Core.CodeBinding/Startup.cs

@@ -116,6 +116,7 @@ namespace Aucma.Core.CodeBinding
             // Socket连接扫码器
             app.UseTouchSocketMildd(socket);
 
+            // 集存库泡后库用电采集，报警采集
             app.UseDataCollectorExtensions();
         }
 

Aucma.Core.ProductOffLine/Startup.cs

@@ -6,6 +6,7 @@ using Admin.Core.IService.ISys;
 using Admin.Core.Model;
 using Admin.Core.Repository;
 using Admin.Core.Service;
+using Admin.Core.Socket;
 using Admin.Core.Tasks;
 using Aucma.Core.RunPlc;
 using Aucma.Core.Scanner;
@@ -14,6 +15,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using System.Net.Sockets;
 using System.Text;
 
 namespace Aucma.Core.ProductOffLine
@@ -65,6 +67,10 @@ namespace Aucma.Core.ProductOffLine
             //扫码器
             services.AddScannerSetup();
 
+            //socket连接扫码器
+          //  services.AddTouchSocketSetup();
+
+
             //任务调度
             //   services.AddJobSetup();
 
@@ -91,7 +97,7 @@ namespace Aucma.Core.ProductOffLine
         /// </summary>
         /// <param name="app"></param>
         /// <param name="env"></param>
-        public void Configure(IApplicationBuilder app, IScannerService scannerService, IRunPlcService runPlcService)//, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter
+        public void Configure(IApplicationBuilder app, IScannerService scannerService, IRunPlcService runPlcService)//, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter,ITouchSocketService socket
         {
             // 使用静态文件
             app.UseStaticFiles();
@@ -104,6 +110,10 @@ namespace Aucma.Core.ProductOffLine
             app.UseScannerMildd(scannerService);
             //PLC
             app.UsePlcMildd(runPlcService);
+
+            // Socket连接扫码器
+         //   app.UseTouchSocketMildd(socket);
+
         }
 
         #region 注册服务

Aucma.Core.ProductOffLine/Views/ChooseDirectionWindow.xaml

@@ -17,8 +17,8 @@
 
             <Label Content="扫码枪扫描位置:" FontSize="20" Foreground="White" HorizontalAlignment="Left" Margin="108,131,0,0" VerticalAlignment="Top" Height="50" Width="161"/>
             <ComboBox   Name="SelectedMaterialType"  Margin="290,120,167,0" FontSize="30" Foreground="White" VerticalAlignment="Top">
-                <ComboBoxItem Content="外侧提升机" Foreground="Blue"/>
-                <ComboBoxItem Content="内侧提升机" Foreground="Blue" />
+                <ComboBoxItem Content="东侧提升机" Foreground="Blue"/>
+                <ComboBoxItem Content="西侧提升机" Foreground="Blue" />
             </ComboBox>
         </Grid>
 

Aucma.Core.ProductOffLine/Views/HandSendPlcWindow.xaml

@@ -9,8 +9,8 @@
 
     <Grid Background="#1152AC" >
 
-        <Button Content="外侧提升机" Click="LeftButton_Click" Height="70" Background="Green" Width="130" Margin="49,107,221,88" />
-        <Button Content="内侧提升机" Click="RightButton_Click" Height="70"  Background="Green" Width="130" Margin="220,107,50,88" />
+        <Button Content="东侧提升机" Click="LeftButton_Click" Height="70" Background="Green" Width="130" Margin="49,107,221,88" />
+        <Button Content="西侧提升机" Click="RightButton_Click" Height="70"  Background="Green" Width="130" Margin="220,107,50,88" />
 
 
     </Grid>