覆盖文件提交/bug修改

git-svn-id: http://10.4.3.168:50001/svn/Furnace@72 dbcde07d-dcf5-c148-8a84-ac3097b7778e

FrameworkLocal/Common/Common.csproj

@@ -596,7 +596,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Config\EventDefine.Core.xml" />
-    <Content Include="Resources\LoadPort.png" />
+    <Resource Include="Resources\LoadPort.png" />
     <Content Include="Resources\Logos\MyLogoNormal.ico" />
     <Content Include="Resources\Logos\MyLogoPurple.ico" />
     <Resource Include="Resources\Valve\valveOpenVerticalJet.png" />

Furnace/FurnaceUI/Views/Maintenances/LPSensorViewModel.cs

@@ -166,12 +166,12 @@ namespace FurnaceUI.Views.Maintenances
         public void DoLoadPortCmd(string deviceName, string cmd)
         {
 
-            if (cmd == "SetAMHS" && deviceName == "LP1" && !LP1CarrierInfo.IsEmpty)
+            if (cmd == "SetAMHS" && deviceName == "LP1" && LP1CarrierInfo != null && !LP1CarrierInfo.IsEmpty)
             {
                 DialogBox.ShowWarning($"{deviceName} change to auto failed, for FOUP present");
                 return;
             }
-            if (cmd == "SetAMHS" && deviceName == "LP2" && !LP2CarrierInfo.IsEmpty)
+            if (cmd == "SetAMHS" && deviceName == "LP2" && LP2CarrierInfo != null && !LP2CarrierInfo.IsEmpty)
             {
                 DialogBox.ShowWarning($"{deviceName} change to auto failed, for FOUP present");
                 return;