添加产品切换，并支持写入PLC相关型号编号

TeamAAS-VM/Core/Management.cs

@@ -854,7 +854,7 @@ namespace TeamAAS_VP.Core
                 try
                 {
                     await WriteSystemParameterToPlcAsync(_configService.GetSystemConfiguration());
-                    await WritePositionToPlcAsync();
+                    await WriteParameterToPlcExAsync();
                 }
                 catch (Exception ex)
                 {
@@ -1035,6 +1035,17 @@ namespace TeamAAS_VP.Core
             plc.SubscribeNodes("AutoSensor", monitorNodeIds, PlcCommandTrigger);
         }
 
+        /// <summary>
+        /// 将产品的参数统一写入PLC
+        /// </summary>
+        /// <returns></returns>
+        public async Task WriteParameterToPlcExAsync()
+        {
+            await WritePositionToPlcAsync();// 写入点位信息给PLC
+            await WriteParameterToPlcAsync();// 写入组装上下限给PLC
+            await WriteProductLoadModeToPLC();//把当前产品型号，写入PLC
+        }
+
         /// <summary>
         /// 写入点位信息给PLC
         /// </summary>
@@ -1120,6 +1131,10 @@ namespace TeamAAS_VP.Core
             }
         }
 
+        /// <summary>
+        /// 写入组装上下限给PLC
+        /// </summary>
+        /// <returns></returns>
         public async Task WriteParameterToPlcAsync()
         {
             var addressConfig = _configService.GetPlcAddresses();
@@ -1144,7 +1159,38 @@ namespace TeamAAS_VP.Core
             {
 
             }
+        }
 
+        /// <summary>
+        /// 将当前产品类型写入PLC
+        /// </summary>
+        /// <param name="mode"></param>
+        public async Task WriteProductLoadModeToPLC(int modeIndex)
+        {
+            var addressConfig = _configService.GetPlcAddresses();
+            var plc = _plcService.GetPlcByNumber(addressConfig.PlcNo) as OpcUaClientPLC;
+            if (plc == null || !plc.IsConnected) return;
+
+            await plc.WriteNodeAsync(addressConfig.Out_ProductLoadMode.Address, (Int16)modeIndex);
+        }
+
+        /// <summary>
+        /// 将当前产品类型写入PLC
+        /// </summary>
+        /// <param name="mode"></param>
+        public async Task WriteProductLoadModeToPLC()
+        {
+            var addressConfig = _configService.GetPlcAddresses();
+            var plc = _plcService.GetPlcByNumber(addressConfig.PlcNo) as OpcUaClientPLC;
+            if (plc == null || !plc.IsConnected) return;
+
+            var current = _productService.GetCurrentProduct();
+            if (current == null) return;
+
+            var qMes = await _systemDatabaseService.QueryProductFromMesAsync(current.Name);
+            if (qMes == null) return;
+
+            await plc.WriteNodeAsync(addressConfig.Out_ProductLoadMode.Address, (Int16)qMes.ProductLoadMode);
         }
 
         /// <summary>
@@ -2601,13 +2647,13 @@ namespace TeamAAS_VP.Core
                                                 if (i == 0)//i=0时才会切换产品
                                                 {
                                                     var q = await _systemDatabaseService.QueryProductFromMesAsync(model_num[i], color[i]);
-                                                    if (!string.IsNullOrEmpty(q))
+                                                    if (q != null && !string.IsNullOrEmpty(q.ProductName))
                                                     {
                                                         ProductList = new ObservableCollection<ProductModel>(_productService.GetAllProducts());
                                                         Guid productId = Guid.Empty;
                                                         foreach (var itt in ProductList)
                                                         {
-                                                            if (itt.Name == q)
+                                                            if (itt.Name == q.ProductName)
                                                             {
                                                                 productId = itt.ID;
                                                                 break;
@@ -2616,9 +2662,9 @@ namespace TeamAAS_VP.Core
                                                         if (currentProduct.ID != productId)
                                                         {
                                                             //切换产品
-                                                            _productService.LoadProduct(productId);
+                                                            await _productService.LoadProductAsync(productId);
                                                             _productService.SetCurrentProduct(productId);
-                                                            await WritePositionToPlcAsync();
+                                                            await WriteParameterToPlcExAsync();
                                                             SendTaskMessage($"切换产品成功", MessageLevel.Debug);
                                                         }
                                                     }
@@ -2697,13 +2743,13 @@ namespace TeamAAS_VP.Core
                                             if (i == 0)//i=0时才会切换产品
                                             {
                                                 var q = await _systemDatabaseService.QueryProductFromMesAsync(model_num[i], color[i]);
-                                                if (!string.IsNullOrEmpty(q))
+                                                if (q != null && !string.IsNullOrEmpty(q.ProductName))
                                                 {
                                                     ProductList = new ObservableCollection<ProductModel>(_productService.GetAllProducts());
                                                     Guid productId = Guid.Empty;
                                                     foreach (var itt in ProductList)
                                                     {
-                                                        if (itt.Name == q)
+                                                        if (itt.Name == q.ProductName)
                                                         {
                                                             productId = itt.ID;
                                                             break;
@@ -2712,9 +2758,9 @@ namespace TeamAAS_VP.Core
                                                     if (currentProduct.ID != productId)
                                                     {
                                                         //切换产品
-                                                        _productService.LoadProduct(productId);
+                                                        await _productService.LoadProductAsync(productId);
                                                         _productService.SetCurrentProduct(productId);
-                                                        await WritePositionToPlcAsync();
+                                                        await WriteParameterToPlcExAsync();
                                                         SendTaskMessage($"切换产品成功", MessageLevel.Debug);
                                                     }
                                                 }
@@ -2861,7 +2907,7 @@ namespace TeamAAS_VP.Core
 
                                         foreach (var item in gapDict)
                                         {
-                                            string upLimitValue = "" ,downLimitValue = "";
+                                            string upLimitValue = "", downLimitValue = "";
                                             switch (item.Key)
                                             {
                                                 case "Gap1":
@@ -3169,7 +3215,6 @@ namespace TeamAAS_VP.Core
         #endregion
 
         #region 方法
-
         private void SendTaskMessage(string msg, MessageLevel level)
         {
             App.Current.Dispatcher.Invoke(() =>

TeamAAS-VM/Data/SystemDatabaseService.cs

@@ -929,18 +929,25 @@ namespace TeamAAS_VP.Data
         }
 
         /// <summary>
-        /// 通过产品的编码和颜色查询产品的名称
+        /// 通过产品的编码和颜色查询产品
         /// </summary>
         /// <param name="code"></param>
         /// <returns></returns>
-        public async Task<string> QueryProductFromMesAsync(string code, string color)
+        public async Task<ProductWithMes> QueryProductFromMesAsync(string code, string color)
         {
             var v = await _db.Queryable<ProductWithMes>().Where(r => r.ProductCode == code && r.ProductColor == color).FirstAsync();
-            if (v == null || v.ProductName == null)
-            {
-                return "";
-            }
-            return v.ProductName;
+            return v;
+        }
+
+        /// <summary>
+        /// 通过产品名称的查询产品
+        /// </summary>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        public async Task<ProductWithMes> QueryProductFromMesAsync(string name)
+        {
+            var v = await _db.Queryable<ProductWithMes>().Where(r => r.ProductName == name).FirstAsync();
+            return v;
         }
         #endregion
     }

TeamAAS-VM/Interfaces/ISystemDatabaseService.cs

@@ -474,11 +474,18 @@ namespace TeamAAS_VP.Interfaces
         Task<List<ProductWithMes>> QueryProductWithMesALLAsync();
 
         /// <summary>
-        /// 通过产品的编码和颜色查询产品的id
+        /// 通过产品的编码和颜色查询产品
         /// </summary>
         /// <param name="code"></param>
         /// <returns></returns>
-        Task<string> QueryProductFromMesAsync(string code, string color);
+        Task<ProductWithMes> QueryProductFromMesAsync(string code, string color);
+
+        /// <summary>
+        /// 通过产品名称的查询产品
+        /// </summary>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        Task<ProductWithMes> QueryProductFromMesAsync(string name);
         #endregion
     }
 }

TeamAAS-VM/Models/PLC/PlcAddressConfig.cs

@@ -18,14 +18,24 @@ namespace TeamAAS_VP.Models.PLC
             set { SetProperty(ref _PlcNo, value); }
         }
 
-        private PlcAddress _WorkMode = new PlcAddress();
+        private PlcAddress _Out_ProductLoadMode;
+        /// <summary>
+        /// 产品切换类型
+        /// </summary>
+        public PlcAddress Out_ProductLoadMode
+        {
+            get { return _Out_ProductLoadMode; }
+            set { SetProperty(ref _Out_ProductLoadMode, value); }
+        }
+
+        private PlcAddress _Out_WorkMode = new PlcAddress();
         /// <summary>
         /// 工作模式 =1 拍1打1 =2 拍1打所有
         /// </summary>
         public PlcAddress Out_WorkMode
         {
-            get { return _WorkMode; }
-            set { SetProperty(ref _WorkMode, value); }
+            get { return _Out_WorkMode; }
+            set { SetProperty(ref _Out_WorkMode, value); }
         }
 
         private PlcAddress _QrCodePhotoResault = new PlcAddress();
@@ -783,6 +793,11 @@ namespace TeamAAS_VP.Models.PLC
 
 
             // 2. 按 JSON 提供的数据设置默认值（以当前属性名为准）
+            Out_ProductLoadMode = Ensure(Out_ProductLoadMode);
+            Out_ProductLoadMode.Address = "ns=4;s=DB_Communication|FromPC.ProductLoadMode";
+            Out_ProductLoadMode.DataType = "int16";
+            Out_ProductLoadMode.Description = "产品切换类型";
+
             Out_WorkMode = Ensure(Out_WorkMode);
             Out_WorkMode.Address = "ns=4;s=DB_Communication|FromPC.WorkMode";
             Out_WorkMode.DataType = "int16";

TeamAAS-VM/Models/ProductWithMes.cs

@@ -47,5 +47,15 @@ namespace TeamAAS_VP.Models
             get { return _ProductColor; }
             set { SetProperty(ref _ProductColor, value); }
         }
+
+        private int _ProductLoadMode;
+        /// <summary>
+        /// 产品加载编号
+        /// </summary>
+        public int ProductLoadMode
+        {
+            get { return _ProductLoadMode; }
+            set { SetProperty(ref _ProductLoadMode, value); }
+        }
     }
 }

TeamAAS-VM/ViewModels/HomeViewModel.cs

@@ -222,8 +222,6 @@ namespace TeamAAS_VP.ViewModels
             {
                 InitPressurePlots(systemConfig.PressureSensorConfig.ToArray());
             }
-
-
         }
 
         private void _remoteCommandService_CycleTimingTicked(object sender, TimeSpan e)
@@ -272,8 +270,7 @@ namespace TeamAAS_VP.ViewModels
                     var task = DialogHost.Show(waiting, "RootDialog", null, null, null);
                     await _productService.LoadProductAsync(product.ID);
                     _productService.SetCurrentProduct(product.ID);
-                    await management.WritePositionToPlcAsync();
-                    await management.WriteParameterToPlcAsync();
+                    await management.WriteParameterToPlcExAsync();
                     if (DialogHost.IsDialogOpen("RootDialog"))
                     {
                         DialogHost.Close("RootDialog");

TeamAAS-VM/ViewModels/MainWindowViewModel.cs

@@ -341,8 +341,7 @@ namespace TeamAAS_VP.ViewModels
                     }
                 }
                 _container.Resolve<ShowVisionRenderViewModel>().Renders = management.Renders;
-                await management.WritePositionToPlcAsync();
-                await management.WriteParameterToPlcAsync();
+                await management.WriteParameterToPlcExAsync();
             }
             var homeviewmodel = _container.Resolve<HomeViewModel>();
             homeviewmodel.OnNavigatedTo(null);

TeamAAS-VM/ViewModels/Product/ProductParamsViewModel.cs

@@ -488,7 +488,7 @@ namespace TeamAAS_VP.ViewModels.Product
                     var current = _productService.GetCurrentProduct();
                     if (current != null && current.IsLoad)
                     {
-                        await management.WritePositionToPlcAsync();
+                        await management.WriteParameterToPlcExAsync();
                     }
                     if (DialogHost.IsDialogOpen("RootDialog"))
                     {

TeamAAS-VM/ViewModels/SettingViewModel.cs

@@ -1793,11 +1793,13 @@ namespace TeamAAS_VP.ViewModels
             {
                 ProMesInfo.ProductCode = "";
                 ProMesInfo.ProductColor = "";
+                ProMesInfo.ProductLoadMode = 0;
             }
             else
             {
                 ProMesInfo.ProductCode = v.ProductCode;
                 ProMesInfo.ProductColor = v.ProductColor;
+                ProMesInfo.ProductLoadMode = v.ProductLoadMode;
             }
         }
 
@@ -1812,6 +1814,7 @@ namespace TeamAAS_VP.ViewModels
                 {
                     ProMesInfo.ProductCode = "";
                     ProMesInfo.ProductColor = "";
+                    ProMesInfo.ProductLoadMode = 0;
                 }
             }
         }

TeamAAS-VM/Views/SettingView.xaml

@@ -473,7 +473,7 @@
                                          Grid.Column="1"
                                          Text="{Binding SelectDeviceInfo.ApiKey, Mode=TwoWay}"
                                          Margin="6,2" />
-                                
+
                                 <TextBlock Grid.Row="11"
                                            Grid.Column="0"
                                            Text="启用 MES:"
@@ -1999,7 +1999,7 @@
                     </ScrollViewer>
                 </Grid>
             </TabItem>
-            
+
             <!--螺丝供料器-->
             <TabItem>
                 <TabItem.Header>
@@ -2210,7 +2210,7 @@
                                       IsChecked="{Binding SelectScrewFeeder.LowLevelAlarmEnabled,Mode=TwoWay}"
                                       VerticalAlignment="Center" />
 
-                            
+
                         </Grid>
                     </ScrollViewer>
                 </Grid>
@@ -2877,12 +2877,12 @@
                                 </Grid>
                             </GroupBox>
 
-                            
+
                         </StackPanel>
                     </StackPanel>
                 </ScrollViewer>
             </TabItem>
-            
+
             <!--产品信息-->
             <TabItem>
                 <TabItem.Header>
@@ -2911,7 +2911,8 @@
                                 <ColumnDefinition Width="auto" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="auto" />
+                                <RowDefinition Height=" auto" />
+                                <RowDefinition Height=" auto" />
                                 <RowDefinition Height=" auto" />
                                 <RowDefinition Height=" auto" />
                                 <RowDefinition Height=" auto" />
@@ -2991,7 +2992,28 @@
                                 </TextBox.Text>
                             </TextBox>
 
-                            <StackPanel Grid.Row="5"
+                            <TextBlock Margin="0,0,0,8"
+                                  Grid.Row="3"
+                                  VerticalAlignment="Center"
+                                  Text="产品类型:"
+                                  FontSize="{DynamicResource Font.Size.Body3}"
+                                  HorizontalAlignment="Right" />
+                            <TextBox Grid.Row="3"
+                                Grid.Column="1"
+                                Margin="10,4"
+                                MinWidth="100"
+                                FontSize="{DynamicResource Font.Size.Body3}"
+                                TextAlignment="Center"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center">
+                                <TextBox.Text>
+                                    <Binding Path="ProMesInfo.ProductLoadMode"
+                                        Mode="TwoWay">
+                                    </Binding>
+                                </TextBox.Text>
+                            </TextBox>
+
+                            <StackPanel Grid.Row="6"
                             Grid.ColumnSpan="2"
                             Margin="0,6"
                             Orientation="Horizontal"
@@ -3041,7 +3063,7 @@
                     </GroupBox>
                 </StackPanel>
             </TabItem>
-            
+
             <!--生产排班-->
             <TabItem>
                 <TabItem.Header>
@@ -3360,7 +3382,7 @@
                     </Button>
                 </StackPanel>
             </TabItem>
-            
+
         </TabControl>
 
     </Grid>