1

wms.service/Service/FJService.cs

@@ -1063,62 +1063,62 @@ namespace wms.service.Service
                     {                        
                         if (wCode == "1N")
                         {
-                            if (count_1S > count_2N && count_1S > count_2S)
+                            if (count_1S >= count_2N && count_1S >= count_2S)
                             {
                                 wCode = (taskInfoCount_1S < sameSideTaskNum) ? "1S" : (taskInfoCount_2N < sameSideTaskNum ? "2N" : "2S");                                                           
                             }
-                            else if (count_2N > count_1S && count_2N > count_2S)
+                            else if (count_2N >= count_1S && count_2N >= count_2S)
                             {
                                 wCode = (taskInfoCount_2N < sameSideTaskNum) ? "2N" : (taskInfoCount_1S < sameSideTaskNum ? "1S" : "2S");
                             }
-                            else if (count_2S > count_1S && count_2S > count_2N)
+                            else if (count_2S >= count_1S && count_2S >= count_2N)
                             {
                                 wCode = (taskInfoCount_2S < sameSideTaskNum) ? "2S" : (taskInfoCount_1S < sameSideTaskNum ? "1S" : "2N");
                             }
                         }
                         else if (wCode == "1S")
                         {
-                            if (count_1N > count_2N && count_1N > count_2S && taskInfoCount_1N < sameSideTaskNum)
+                            if (count_1N >= count_2N && count_1N >= count_2S)
                             {
                                 wCode = (taskInfoCount_1N < sameSideTaskNum) ? "1N" : (taskInfoCount_2N < sameSideTaskNum ? "2N" : "2S");
                             }
-                            else if (count_2N > count_1N && count_2N > count_2S && taskInfoCount_2N < sameSideTaskNum)
+                            else if (count_2N >= count_1N && count_2N >= count_2S)
                             {
                                 wCode = (taskInfoCount_2N < sameSideTaskNum) ? "2N" : (taskInfoCount_1N < sameSideTaskNum ? "1N" : "2S");
                             }
-                            else if (count_2S > count_1N && count_2S > count_2N && taskInfoCount_2S < sameSideTaskNum)
+                            else if (count_2S >= count_1N && count_2S >= count_2N)
                             {
                                 wCode = (taskInfoCount_2S < sameSideTaskNum) ? "2S" : (taskInfoCount_1N < sameSideTaskNum ? "1N" : "2N");
                             }
                         }
                         else if (wCode == "2N")
                         {
-                            if (count_2S > count_1N && count_2S > count_1S && taskInfoCount_2S < sameSideTaskNum)
+                            if (count_2S >= count_1N && count_2S >= count_1S)
                             {
                                 wCode = (taskInfoCount_2S < sameSideTaskNum) ? "2S" : (taskInfoCount_1N < sameSideTaskNum ? "1N" : "1S");
                             }
-                            else if (count_1N > count_1S && count_1N > count_2S && taskInfoCount_1N < sameSideTaskNum)
+                            else if (count_1N >= count_1S && count_1N >= count_2S)
                             {
                                 wCode = (taskInfoCount_1N < sameSideTaskNum) ? "1N" : (taskInfoCount_1S < sameSideTaskNum ? "1S" : "2S");
                             }
-                            else if (count_1S > count_1N && count_1S > count_2S && taskInfoCount_1S < sameSideTaskNum)
+                            else if (count_1S >= count_1N && count_1S >= count_2S)
                             {
-                                wCode = (taskInfoCount_1S < sameSideTaskNum) ? "1S" : (taskInfoCount_2N < sameSideTaskNum ? "1N" : "2S");
+                                wCode = (taskInfoCount_1S < sameSideTaskNum) ? "1S" : (taskInfoCount_1N < sameSideTaskNum ? "1N" : "2S");
                             }
                         }
                         else if (wCode == "2S")
                         {
-                            if (count_2N > count_1S && count_2N > count_1N && taskInfoCount_2N < sameSideTaskNum)
+                            if (count_2N >= count_1S && count_2N >= count_1N)
                             {
                                 wCode = (taskInfoCount_2N < sameSideTaskNum) ? "2N" : (taskInfoCount_1N < sameSideTaskNum ? "1N" : "1S");
                             }
-                            else if (count_1N > count_1S && count_1N > count_2N && taskInfoCount_1N < sameSideTaskNum)
+                            else if (count_1N >= count_1S && count_1N >= count_2N)
                             {
                                 wCode = (taskInfoCount_1N < sameSideTaskNum) ? "1N" : (taskInfoCount_1S < sameSideTaskNum ? "1S" : "2N");
                             }
-                            else if (count_1S > count_1N && count_1S > count_2N && taskInfoCount_1S < sameSideTaskNum)
+                            else if (count_1S >= count_1N && count_1S >= count_2N)
                             {
-                                wCode = (taskInfoCount_1S < sameSideTaskNum) ? "1S" : (taskInfoCount_2N < sameSideTaskNum ? "1N" : "2N");
+                                wCode = (taskInfoCount_1S < sameSideTaskNum) ? "1S" : (taskInfoCount_2N < sameSideTaskNum ? "2N" : "1N");
                             }
                         }
                     }