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

TeamAAS-VM/Core/Management.cs

@@ -1967,7 +1967,7 @@ namespace TeamAAS_VP.Core
                                 //plc启用的模式
                                 bool models = plc.ReadNode<bool>(addressConfig.Cam_code_mode.Address);
 
-                                if (models)
+                                if (models && state == 1)
                                 {
                                     //拍照读码
                                     SendTaskMessage(Lang.触发上相机锁附组装拍照, MessageLevel.Debug);

TeamAAS-VM/TeamAAS-VP.csproj

@@ -1580,7 +1580,9 @@
       <LastGenOutput>Lang.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Languages\Lang.zh-TW.resx" />
+    <EmbeddedResource Include="Resources\Languages\Lang.zh-TW.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

TeamAAS-VM/Views/SettingView.xaml

@@ -2493,7 +2493,7 @@
                             </Grid>
                         </GroupBox>
 
-                        <GroupBox Header="电批配置"  Width="300">
+                        <GroupBox Header="扭力测量仪配置"  Width="300">
                             <Grid Margin="10">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="auto" />
@@ -2560,7 +2560,7 @@
                                         <materialDesign:PackIcon Kind="ContentSaveCheck"
                                          Margin="0,0,6,0" />
                                         <TextBlock VerticalAlignment="Center"
-                           Text="保存电批配置" />
+                           Text="保存扭力测量仪配置" />
                                     </StackPanel>
                                 </Button>
                             </Grid>