徐孝锋 8 сар өмнө
parent
commit
d2add38dda

+ 67 - 13
TeamAAS-VM/ViewModels/Product/ProductParamsViewModel.cs

@@ -94,7 +94,7 @@ namespace TeamAAS_VP.ViewModels.Product
             get { return _FixedUpCamera2Procedure; }
             set
             {
-                SetProperty(ref _FixedUpCamera2Procedure, value); 
+                SetProperty(ref _FixedUpCamera2Procedure, value);
                 if (value != null)
                 {
                     SelectProduct.FixedUpCamera2ProcedureId = value.Id;
@@ -109,7 +109,9 @@ namespace TeamAAS_VP.ViewModels.Product
         public ProcedureModel FixedDownCamera1Procedure
         {
             get { return _FixedDownCamera1Procedure; }
-            set { SetProperty(ref _FixedDownCamera1Procedure, value);
+            set
+            {
+                SetProperty(ref _FixedDownCamera1Procedure, value);
                 if (value != null)
                 {
                     SelectProduct.FixedDownCamera1ProcedureId = value.Id;
@@ -141,7 +143,9 @@ namespace TeamAAS_VP.ViewModels.Product
         public ProcedureModel MoveDownCamera1LockPhotoProcedure
         {
             get { return _MoveDownCamera1LockPhotoProcedure; }
-            set { SetProperty(ref _MoveDownCamera1LockPhotoProcedure, value);
+            set
+            {
+                SetProperty(ref _MoveDownCamera1LockPhotoProcedure, value);
                 if (value != null)
                 {
                     SelectProduct.MoveDownCamera1LockPhotoProcedureId = value.Id;
@@ -207,7 +211,9 @@ namespace TeamAAS_VP.ViewModels.Product
         public ProcedureModel IndependentCamer1ProductProcedureId
         {
             get { return _IndependentCamer1ProductProcedureId; }
-            set { SetProperty(ref _IndependentCamer1ProductProcedureId, value); 
+            set
+            {
+                SetProperty(ref _IndependentCamer1ProductProcedureId, value);
                 if (value != null)
                 {
                     SelectProduct.IndependentCamer1ProductProcedureId = value.Id;
@@ -222,7 +228,9 @@ namespace TeamAAS_VP.ViewModels.Product
         public ProcedureModel IndependentCamer2ProductProcedureId
         {
             get { return _IndependentCamer2ProductProcedureId; }
-            set { SetProperty(ref _IndependentCamer2ProductProcedureId, value);
+            set
+            {
+                SetProperty(ref _IndependentCamer2ProductProcedureId, value);
                 if (value != null)
                 {
                     SelectProduct.IndependentCamer2ProductProcedureId = value.Id;
@@ -237,7 +245,9 @@ namespace TeamAAS_VP.ViewModels.Product
         public ProcedureModel IndependentCamer3ProductProcedureId
         {
             get { return _IndependentCamer3ProductProcedureId; }
-            set { SetProperty(ref _IndependentCamer3ProductProcedureId, value);
+            set
+            {
+                SetProperty(ref _IndependentCamer3ProductProcedureId, value);
                 if (value != null)
                 {
                     SelectProduct.IndependentCamer3ProductProcedureId = value.Id;
@@ -252,7 +262,9 @@ namespace TeamAAS_VP.ViewModels.Product
         public ProcedureModel IndependentCamer4ProductProcedureId
         {
             get { return _IndependentCamer4ProductProcedureId; }
-            set { SetProperty(ref _IndependentCamer4ProductProcedureId, value);
+            set
+            {
+                SetProperty(ref _IndependentCamer4ProductProcedureId, value);
                 if (value != null)
                 {
                     SelectProduct.IndependentCamer4ProductProcedureId = value.Id;
@@ -267,7 +279,9 @@ namespace TeamAAS_VP.ViewModels.Product
         public ProcedureModel IndependentCamer1AuxProcedureId
         {
             get { return _IndependentCamer1AuxProcedureId; }
-            set { SetProperty(ref _IndependentCamer1AuxProcedureId, value);
+            set
+            {
+                SetProperty(ref _IndependentCamer1AuxProcedureId, value);
                 if (value != null)
                 {
                     SelectProduct.IndependentCamer1AuxProcedureId = value.Id;
@@ -282,7 +296,9 @@ namespace TeamAAS_VP.ViewModels.Product
         public ProcedureModel IndependentCamer2AuxProcedureId
         {
             get { return _IndependentCamer2AuxProcedureId; }
-            set { SetProperty(ref _IndependentCamer2AuxProcedureId, value);
+            set
+            {
+                SetProperty(ref _IndependentCamer2AuxProcedureId, value);
                 if (value != null)
                 {
                     SelectProduct.IndependentCamer2AuxProcedureId = value.Id;
@@ -297,7 +313,9 @@ namespace TeamAAS_VP.ViewModels.Product
         public ProcedureModel IndependentCamer3AuxProcedureId
         {
             get { return _IndependentCamer3AuxProcedureId; }
-            set { SetProperty(ref _IndependentCamer3AuxProcedureId, value);
+            set
+            {
+                SetProperty(ref _IndependentCamer3AuxProcedureId, value);
                 if (value != null)
                 {
                     SelectProduct.IndependentCamer3AuxProcedureId = value.Id;
@@ -312,7 +330,9 @@ namespace TeamAAS_VP.ViewModels.Product
         public ProcedureModel IndependentCamer4AuxProcedureId
         {
             get { return _IndependentCamer4AuxProcedureId; }
-            set { SetProperty(ref _IndependentCamer4AuxProcedureId, value);
+            set
+            {
+                SetProperty(ref _IndependentCamer4AuxProcedureId, value);
                 if (value != null)
                 {
                     SelectProduct.IndependentCamer4AuxProcedureId = value.Id;
@@ -405,7 +425,7 @@ namespace TeamAAS_VP.ViewModels.Product
 
         private void ResetId()
         {
-            if(FixedUpCamera1Procedure == null)
+            if (FixedUpCamera1Procedure == null)
             {
                 SelectProduct.FixedUpCamera1ProcedureId = Guid.Empty;
             }
@@ -526,7 +546,7 @@ namespace TeamAAS_VP.ViewModels.Product
                         ProcedureModels.Add(item1);
                     }
                 }
-                if (SelectProduct.FixedUpCamera1ProcedureId!=Guid.Empty)
+                if (SelectProduct.FixedUpCamera1ProcedureId != Guid.Empty)
                 {
                     FixedUpCamera1Procedure = ProcedureModels.FirstOrDefault(p => p.Id == SelectProduct.FixedUpCamera1ProcedureId);
                 }
@@ -558,6 +578,40 @@ namespace TeamAAS_VP.ViewModels.Product
                 {
                     MoveDownCamer2PickPhotoProcedureId = ProcedureModels.FirstOrDefault(p => p.Id == SelectProduct.MoveDownCamer2PickPhotoProcedureId);
                 }
+
+                if (SelectProduct.IndependentCamer1AuxProcedureId != Guid.Empty)
+                {
+                    IndependentCamer1AuxProcedureId = ProcedureModels.FirstOrDefault(p => p.Id == SelectProduct.IndependentCamer1AuxProcedureId);
+                }
+                if (SelectProduct.IndependentCamer2AuxProcedureId != Guid.Empty)
+                {
+                    IndependentCamer2AuxProcedureId = ProcedureModels.FirstOrDefault(p => p.Id == SelectProduct.IndependentCamer2AuxProcedureId);
+                }
+                if (SelectProduct.IndependentCamer3AuxProcedureId != Guid.Empty)
+                {
+                    IndependentCamer3AuxProcedureId = ProcedureModels.FirstOrDefault(p => p.Id == SelectProduct.IndependentCamer3AuxProcedureId);
+                }
+                if (SelectProduct.IndependentCamer4AuxProcedureId != Guid.Empty)
+                {
+                    IndependentCamer4AuxProcedureId = ProcedureModels.FirstOrDefault(p => p.Id == SelectProduct.IndependentCamer4AuxProcedureId);
+                }
+
+                if (SelectProduct.IndependentCamer1ProductProcedureId != Guid.Empty)
+                {
+                    IndependentCamer1ProductProcedureId = ProcedureModels.FirstOrDefault(p => p.Id == SelectProduct.IndependentCamer1ProductProcedureId);
+                }
+                if (SelectProduct.IndependentCamer2ProductProcedureId != Guid.Empty)
+                {
+                    IndependentCamer2ProductProcedureId = ProcedureModels.FirstOrDefault(p => p.Id == SelectProduct.IndependentCamer2ProductProcedureId);
+                }
+                if (SelectProduct.IndependentCamer3ProductProcedureId != Guid.Empty)
+                {
+                    IndependentCamer3ProductProcedureId = ProcedureModels.FirstOrDefault(p => p.Id == SelectProduct.IndependentCamer3ProductProcedureId);
+                }
+                if (SelectProduct.IndependentCamer4ProductProcedureId != Guid.Empty)
+                {
+                    IndependentCamer4ProductProcedureId = ProcedureModels.FirstOrDefault(p => p.Id == SelectProduct.IndependentCamer4ProductProcedureId);
+                }
             }
             catch (Exception ex)
             {