皮带线分配优化

source/DeviceLibrary/assemblyLine/DischargeLine_Partial.cs

@@ -173,7 +173,7 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.NextMoveStep(LineMoveStep.DON_07_SeparateCheck);
                 //  Line3LastTrayP++;
                 LogUtil.info(hengyiName + MoveInfo.SLog + "送料，等待料盘到达接驳台 ");
-                MoveInfo.TimeOutSeconds = 40;
+                MoveInfo.TimeOutSeconds = 40; 
                 //MoveInfo.OneWaitCanEndStep = true;
                 //MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(65000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SeparateDevice_Check, IO_VALUE.HIGH));
@@ -186,7 +186,7 @@ namespace OnlineStore.DeviceLibrary
                 IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.HIGH);
                 if (IOValue(IO_Type.SeparateDevice_Check).Equals(IO_VALUE.HIGH))
                 {
-                    SeparateStopTime = DateTime.Now.AddSeconds(3);
+                    SeparateStopTime = DateTime.Now.AddSeconds(30);
                     int robotIndex = GetRobotIndex();
                     LogUtil.info(hengyiName + MoveInfo.SLog + "送料，接驳台有料，调用arriveRobotLocation=" + robotIndex + "[" + StationInfo_Move.CodeStr + "]");
                     SServerManager.arriveRobotLocation(Name, robotIndex, StationInfo_Move.CodeStr);

source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs

@@ -249,21 +249,21 @@ namespace OnlineStore.DeviceLibrary
                     {
                         //随机分配
                         Random r = new Random();
-                        int value = r.Next(0, 100000) % 6;
+                        int value = r.Next(1, 7) % 6;
 
                         if (lineNum.Equals(1))
                         {
-                            if ((value.Equals(0) || value.Equals(1)))
+                            if ((value.Equals(0) || value.Equals(1)) || value.Equals(2) || value.Equals(3))
                             {
-                                outMsg = "随意放";
+                                outMsg = "随意放" + value;
                                 return inoup;
                             }
                         }
                         else if (lineNum.Equals(2))
                         {
-                            if ((value.Equals(2) || value.Equals(3)))
+                            if (value.Equals(3) || value.Equals(4) || value.Equals(5))
                             {
-                                outMsg = "随意放";
+                                outMsg = "随意放" + value;
                                 return inoup;
                             }
                         }