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

TeamAAS-VM/Core/Management.cs

@@ -1561,7 +1561,7 @@ namespace TeamAAS_VP.Core
                         {
                             SendTaskMessage(Lang.触发上相机检测拍照, MessageLevel.Debug);
                             //相机的编号
-                            Int16 cameraIndex = plc.ReadNode<Int16>(addressConfig.Out_UPCameracheckNum.Address);
+                            Int16 cameraIndex = plc.ReadNode<Int16>(addressConfig.In_UPCameracheckNum.Address);
                             SendTaskMessage(string.Format(Lang.编号0, cameraIndex), MessageLevel.Info);
 
                             //视觉流程ID

TeamAAS-VM/Resources/Languages/Lang.resx

@@ -4062,21 +4062,22 @@
     <value>视觉静态精度分析</value>
   </data>
   <data name="点检螺丝" xml:space="preserve">
-    <value></value>
+    <value />
   </data>
   <data name="下压距离" xml:space="preserve">
     <value>下压距离</value>
   </data>
   <data name="ProcedureSaveImagePathModel_Month_Day_Formula_ProductSN_Time" xml:space="preserve">
     <value>年月/日/配方名/产品SN/产品SN+时间</value>
+    <comment>枚举</comment>
   </data>
   <data name="二维码拍照点位" xml:space="preserve">
     <value>二维码拍照点位</value>
   </data>
   <data name="二维码拍照请求" xml:space="preserve">
-    <value></value>
+    <value />
   </data>
   <data name="二维码拍照点位参数" xml:space="preserve">
-    <value></value>
+    <value />
   </data>
 </root>