皮带线优化。

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -541,7 +541,7 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         second = 30;
                         second = 30;
                     }
                     }
-                    second = (int)(moveInfo.TimeOutSeconds / span.TotalSeconds)*10;
+                    second = (int)(  span.TotalSeconds / moveInfo.TimeOutSeconds) *10;
                     if (second > 120)
                     if (second > 120)
                     {
                     {
                         second = 120;
                         second = 120;

source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs

@@ -255,32 +255,12 @@ namespace OnlineStore.DeviceLibrary
                     //空闲且皮带线出料已结束 
                     //空闲且皮带线出料已结束 
                     if (kongxian)
                     if (kongxian)
                     {
                     {
-                        //随机分配
-                        //Random r = new Random();
-                        //int value = r.Next(1, 7) % 6;
-
-                        //if (lineNum.Equals(1))
-                        //{
-                        //    if ((value.Equals(0) || value.Equals(1)) || value.Equals(2) || value.Equals(3))
-                        //    {
-                        //        outMsg = "随意放" + value;
-                        //        return inoup;
-                        //    }
-                        //}
-                        //else if (lineNum.Equals(2))
-                        //{
-                        //    if (value.Equals(3) || value.Equals(4) || value.Equals(5))
-                        //    {
-                        //        outMsg = "随意放" + value;
-                        //        return inoup;
-                        //    }
-                        //}
                         if (lineNum.Equals(1) || lineNum.Equals(2))
                         if (lineNum.Equals(1) || lineNum.Equals(2))
                         {
                         {
-                            if (LastValue.Equals(0))
+                            if (LastValue<=2)
                             {
                             {
                                 outMsg = "随意放" + LastValue;
                                 outMsg = "随意放" + LastValue;
-                                LastValue = 1;
+                                LastValue++;
                                 return inoup;
                                 return inoup;
                             }
                             }
                             else
                             else