Merge branch 'master' of http://49.235.130.76/XXF_1122/DaisyNPILine

TeamAAS-VM/Models/Product/ProductModel.cs

@@ -277,6 +277,16 @@ namespace TeamAAS_VP.Models
             set { SetProperty(ref _CheckCameraPoints, value); }
         }
 
+        private ObservableCollection<PlcPoint> _QrCodePoints = new ObservableCollection<PlcPoint>();
+        /// <summary>
+        /// 二维码拍照点位参数集合
+        /// </summary>
+        public ObservableCollection<PlcPoint> QrCodePoints
+        {
+            get { return _QrCodePoints; }
+            set { SetProperty(ref _QrCodePoints, value); }
+        }
+
 
         private bool _IsLoad;
         /// <summary>

TeamAAS-VM/Resources/Languages/Lang.Designer.cs

@@ -2103,6 +2103,15 @@ namespace TeamAAS_VP.Resources.Languages {
             }
         }
         
+        /// <summary>
+        ///   查找类似 二维码拍照点位 的本地化字符串。
+        /// </summary>
+        public static string 二维码拍照点位 {
+            get {
+                return ResourceManager.GetString("二维码拍照点位", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 产品 的本地化字符串。
         /// </summary>

TeamAAS-VM/Resources/Languages/Lang.en.resx

@@ -3966,4 +3966,7 @@
   <data name="为PLC写入系统参数和订阅变量时出错" xml:space="preserve">
     <value>An error occurred while writing system parameters to the PLC and subscribing to variables.</value>
   </data>
+  <data name="二维码拍照点位" xml:space="preserve">
+    <value>QR Code Shooting Position</value>
+  </data>
 </root>

TeamAAS-VM/Resources/Languages/Lang.ja-JP.resx

@@ -3966,4 +3966,7 @@
   <data name="为PLC写入系统参数和订阅变量时出错" xml:space="preserve">
     <value>PLC にシステムパラメータを書き込み、変数を購読する際にエラーが発生しました。</value>
   </data>
+  <data name="二维码拍照点位" xml:space="preserve">
+    <value>QR コード撮影ポジション</value>
+  </data>
 </root>

TeamAAS-VM/Resources/Languages/Lang.resx

@@ -4070,4 +4070,7 @@
   <data name="ProcedureSaveImagePathModel_Month_Day_Formula_ProductSN_Time" xml:space="preserve">
     <value>年月/日/配方名/产品SN/产品SN+时间</value>
   </data>
+  <data name="二维码拍照点位" xml:space="preserve">
+    <value>二维码拍照点位</value>
+  </data>
 </root>

TeamAAS-VM/Resources/Languages/Lang.zh-TW.resx

@@ -3966,4 +3966,7 @@
   <data name="为PLC写入系统参数和订阅变量时出错" xml:space="preserve">
     <value>寫入系統參數至 PLC 及訂閱變數時發生錯誤。</value>
   </data>
+  <data name="二维码拍照点位" xml:space="preserve">
+    <value>QRCODE 拍攝定位點</value>
+  </data>
 </root>

TeamAAS-VM/ViewModels/Product/PlcPointParamsViewModel.cs

@@ -843,6 +843,9 @@ namespace TeamAAS_VP.ViewModels.Product
                 case 5:
                     Points = SelectProduct.CheckCameraPoints;
                     break;
+                case 6:
+                    Points = SelectProduct.QrCodePoints;
+                    break;
                 default:
                     break;
             }

TeamAAS-VM/Views/Product/PlcPointParams.xaml

@@ -283,6 +283,18 @@
                                 </ListBoxItem.Style>
                                 <TextBlock Text="{lex:Loc 复检点位}" />
                             </ListBoxItem>
+                            <ListBoxItem>
+                                <ListBoxItem.Style>
+                                    <Style TargetType="ListBoxItem"
+                                           BasedOn="{StaticResource MaterialDesign3.NavigationBarPrimaryListBoxItem}">
+                                        <Setter Property="materialDesign:NavigationBarAssist.SelectedIcon"
+                                                Value="Circle" />
+                                        <Setter Property="materialDesign:NavigationBarAssist.UnselectedIcon"
+                                                Value="CircleOutline" />
+                                    </Style>
+                                </ListBoxItem.Style>
+                                <TextBlock Text="{lex:Loc 二维码拍照点位}" />
+                            </ListBoxItem>
                         </ListBox>
                         <!--点位列表操作按钮面板-->
                         <StackPanel DockPanel.Dock="Bottom"