优化LP展示效果

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

Furnace/FurnaceUI/Views/Maintenances/LPSensorViewModel.cs

@@ -53,33 +53,67 @@ namespace FurnaceUI.Views.Maintenances
         public string LP1State { get; set; }
         [Subscription("LP2.Status")]
         public string LP2State { get; set; }
-        //[Subscription("LP2.LoadportState")]
-        //public string LP2State { get; set; }
-        //[Subscription("LP3.LoadportState")]
-        //public string LP3State { get; set; }
-        //[Subscription("LP4.LoadportState")]
-        //public string LP4State { get; set; }
-        //[Subscription("LP1.CarrierId")]
-        //public string LP1CarrierId { get; set; }
-        //[Subscription("LP2.CarrierId")]
-        //public string LP2CarrierId { get; set; }
-        //[Subscription("LP3.CarrierId")]
-        //public string LP3CarrierId { get; set; }
-        //[Subscription("LP4.CarrierId")]
-        //public string LP4CarrierId { get; set; }
+        [Subscription("LP3.Status")]
+        public string LP3State { get; set; }
+        [Subscription("LP4.Status")]
+        public string LP4State { get; set; }
+
         [Subscription("LP1.AccessMode")]
         public string LP1AccessMode { get; set; }
         [Subscription("LP2.AccessMode")]
         public string LP2AccessMode { get; set; }
+        [Subscription("LP3.AccessMode")]
+        public string LP3AccessMode { get; set; }
+        [Subscription("LP4.AccessMode")]
+        public string LP4AccessMode { get; set; }
         [Subscription("LP1.DeviceStatus")]
         public string LP1DeviceStatus { get; set; }
         [Subscription("LP2.DeviceStatus")]
         public string LP2DeviceStatus { get; set; }
+        [Subscription("LP3.DeviceStatus")]
+        public string LP3DeviceStatus { get; set; }
+        [Subscription("LP4.DeviceStatus")]
+        public string LP4DeviceStatus { get; set; }
         [Subscription("LP1.Carrier")]
         public CarrierInfo LP1CarrierInfo { get; set; }
+
         [Subscription("LP2.Carrier")]
         public CarrierInfo LP2CarrierInfo { get; set; }
+        [Subscription("LP3.Carrier")]
+        public CarrierInfo LP3CarrierInfo { get; set; }
+        [Subscription("LP4.Carrier")]
+        public CarrierInfo LP4CarrierInfo { get; set; }
         #endregion
+        private int _tabSelectIndex = 0;
+        public int TabSelectIndex
+        {
+            get => _tabSelectIndex;
+            set
+            {
+                _tabSelectIndex = value;
+                NotifyOfPropertyChange(nameof(TabSelectIndex));
+            }
+        }
+        private bool _lP4BorderVisibility = true;
+        public bool LP4BorderVisibility
+        {
+            get => _lP4BorderVisibility;
+            set
+            {
+                _lP4BorderVisibility = value;
+                NotifyOfPropertyChange(nameof(LP4BorderVisibility));
+            }
+        }
+        private bool _lP3BorderVisibility = true;
+        public bool LP3BorderVisibility
+        {
+            get => _lP3BorderVisibility;
+            set
+            {
+                _lP3BorderVisibility = value;
+                NotifyOfPropertyChange(nameof(LP3BorderVisibility));
+            }
+        }
         private bool _lP2BorderVisibility = true;
         public bool LP2BorderVisibility
         {
@@ -176,6 +210,16 @@ namespace FurnaceUI.Views.Maintenances
                 DialogBox.ShowWarning($"{deviceName} change to auto failed, for FOUP present");
                 return;
             }
+            if (cmd == "SetAMHS" && deviceName == "LP3" && LP3CarrierInfo != null && !LP3CarrierInfo.IsEmpty)
+            {
+                DialogBox.ShowWarning($"{deviceName} change to auto failed, for FOUP present");
+                return;
+            }
+            if (cmd == "SetAMHS" && deviceName == "LP4" && LP4CarrierInfo != null && !LP4CarrierInfo.IsEmpty)
+            {
+                DialogBox.ShowWarning($"{deviceName} change to auto failed, for FOUP present");
+                return;
+            }
             InvokeClient.Instance.Service.DoOperation($"{deviceName}.{cmd}");
         }
         public void Home(object para)

Furnace/FurnaceUI/Views/Operations/TransferMain/SelfCheckViewModel.cs

@@ -1381,7 +1381,11 @@ namespace FurnaceUI.Views.Operations
                 case "LP1":
                     {
                         LPSensorViewModel lpViewModel = new LPSensorViewModel();
+                        lpViewModel.LP1BorderVisibility = true;
                         lpViewModel.LP2BorderVisibility = false;
+                        lpViewModel.LP3BorderVisibility = false;
+                        lpViewModel.LP4BorderVisibility = false;
+                        lpViewModel.TabSelectIndex = 0;
                         (windowManager as WindowManager)?.ShowDialogWithTitle(lpViewModel, null, "LP1 Manual");
                     }
                     break;
@@ -1389,9 +1393,35 @@ namespace FurnaceUI.Views.Operations
                     {
                         LPSensorViewModel lpViewModel = new LPSensorViewModel();
                         lpViewModel.LP1BorderVisibility = false;
+                        lpViewModel.LP2BorderVisibility = true;
+                        lpViewModel.LP3BorderVisibility = false;
+                        lpViewModel.LP4BorderVisibility = false;
+                        lpViewModel.TabSelectIndex =1;
                         (windowManager as WindowManager)?.ShowDialogWithTitle(lpViewModel, null, "LP2 Manual");
                     }
                     break;
+                case "LP3":
+                    {
+                        LPSensorViewModel lpViewModel = new LPSensorViewModel();
+                        lpViewModel.LP1BorderVisibility = false;
+                        lpViewModel.LP2BorderVisibility = false;
+                        lpViewModel.LP3BorderVisibility = true;
+                        lpViewModel.LP4BorderVisibility = false;
+                        lpViewModel.TabSelectIndex = 2;
+                        (windowManager as WindowManager)?.ShowDialogWithTitle(lpViewModel, null, "LP3 Manual");
+                    }
+                    break;
+                case "LP4":
+                    {
+                        LPSensorViewModel lpViewModel = new LPSensorViewModel();
+                        lpViewModel.LP1BorderVisibility = false;
+                        lpViewModel.LP2BorderVisibility = false;
+                        lpViewModel.LP3BorderVisibility = false;
+                        lpViewModel.LP4BorderVisibility = true;
+                        lpViewModel.TabSelectIndex = 3;
+                        (windowManager as WindowManager)?.ShowDialogWithTitle(lpViewModel, null, "LP4 Manual");
+                    }
+                    break;
                 case "FIMS1":
                 case "FIMS2":
                     {