三楼工单送到临时点，采用大料架逻辑

AGVControl-ProductionLine/BLL/AGVManager.cs

@@ -136,7 +136,10 @@ namespace AGVControl
                     {
                         tempLocation = "4CFeederIn";
                     }
-
+                    else if(res[0].location.Equals("3DFeeder") || res[0].location.StartsWith("S"))
+                    {
+                        tempLocation = "S0";
+                    }
                     if (Common.GetNodeNameByLineName(tempLocation, out string loc))
                     {
                         int i = Common.FindNode(loc);

AGVControl-ProductionLine/BLL/Common.cs

@@ -828,7 +828,8 @@ namespace AGVControl
                             return true;
 
                     }
-                    else if (FullShelfDestInfo.location.StartsWith(SettingString.D4_Name_Prefix) && !C4_AGV_IPs.Contains(agv.IP))
+                    else if ((FullShelfDestInfo.location.StartsWith(SettingString.D4_Name_Prefix)|| 
+                        (FullShelfDestInfo.location.StartsWith("S"))) && !C4_AGV_IPs.Contains(agv.IP))
                     {
                         int i = Common.agvInfo.FindIndex(s => s.CurJob is SendFullShelfToLineJob && !s.IP.Equals(agv.IP)
                                 && ((SendFullShelfToLineJob)s.CurJob).FullShelfPlace.Equals(FullShelfDestInfo.location));

AGVControl-ProductionLine/bean/job/SendFullShelfToLineJob.cs

@@ -105,7 +105,7 @@ namespace AGVControl
                     }
                     else
                     {
-                        if(Common.CheckIsInAirDoor(FullShelfPlace))
+                        if (Common.CheckIsInAirDoor(FullShelfPlace))
                         {
                             curJobStep.ToNextStep(SEND_FULL_SHELF_STEP.WAIT_AGV_REACH_AIR_DOOR);
                             runInfo = "到达4C门，过风淋门[" + FullShelfPlace + "][RFID=" + RFID + "]";
@@ -135,12 +135,12 @@ namespace AGVControl
                 {
                     curJobStep.RecordRunLog(agv, JobName, runInfo, FullShelfPlace);
                     curJobStep.ToNextStep(SEND_FULL_SHELF_STEP.WAIT_AGV_REACH_LINE);
-                        runInfo = "送往[" + FullShelfPlace + "][RFID=" + RFID + "]";
-                        msg += runInfo;
-                        curJobStep.Msg = msg;
+                    runInfo = "送往[" + FullShelfPlace + "][RFID=" + RFID + "]";
+                    msg += runInfo;
+                    curJobStep.Msg = msg;
                     Common.SetNodeOccupied(FullShelfPlace, agv.Name);
                     Common.MoveToNode(agv, FullShelfPlace);
-                        UpdateJobTaskInfo(agv.CurTaskName, agv.CurTaskID);                  
+                    UpdateJobTaskInfo(agv.CurTaskName, agv.CurTaskID);
                 }
             }
             else if (curJobStep.IsStep(SEND_FULL_SHELF_STEP.WAIT_REACH_TEMP_PLACE))
@@ -198,13 +198,23 @@ namespace AGVControl
                     }
                     else
                     {
-                        if (RFID.StartsWith("C") && !agv.Place.Equals(SettingString.D4FeederIn) && !agv.Place.Equals(SettingString.C4FeederIn))
+                        if (agv.Place.Equals("S0"))
+                        {
+                            curJobStep.ToNextStep(SEND_FULL_SHELF_STEP.WAIT_BIG_SHELF_UNLOCK);
+                            runInfo = "AGV到达 " + FullShelfPlace + "，并等待3D工单料架[" + RFID + "]库位转移";
+                            msg += runInfo;
+                            curJobStep.Msg = msg;
+                            curJobStep.RecordRunLog(agv, JobName, runInfo, FullShelfPlace);
+                            rtn = Common.mir.Add_Mission_Fleet(agv, Common.agvMission["Play"]);
+                        }
+                        else if (RFID.StartsWith("C") && !agv.Place.Equals(SettingString.D4FeederIn) && !agv.Place.Equals(SettingString.C4FeederIn))
                         {
                             curJobStep.ToNextStep(SEND_FULL_SHELF_STEP.WAIT_BIG_SHELF_UNLOCK);
                             runInfo = "AGV到达 " + FullShelfPlace + "，并等待大料架[" + RFID + "]库位转移";
                             msg += runInfo;
                             curJobStep.Msg = msg;
                             curJobStep.RecordRunLog(agv, JobName, runInfo, FullShelfPlace);
+                            rtn = Common.mir.Add_Mission_Fleet(agv, Common.agvMission["Play"]);
                         }
                         else
                         {
@@ -224,12 +234,16 @@ namespace AGVControl
                 System.Threading.Thread.Sleep(50);
                 if (AGVManager.GetRackBy(RFID, out string lineName) || (input != null && input[0]))
                 {
+                    rtn = Common.mir.Add_Mission_Fleet(agv, Common.agvMission["Stop"]);
                     runInfo = "大料架在" + FullShelfPlace + "库位转移完成 [" + RFID + "] [" + agv.BoxDestInfo + "]";
                     agv.BoxDestInfo = "";
                     msg += runInfo;
                     curJobStep.Msg = msg;
                     curJobStep.RecordRunLog(agv, JobName, runInfo, FullShelfPlace);
-                    return new EmptyShelfBackJob(FullShelfPlace, eShelfType.BigShelf);
+                    if (RFID.StartsWith("D"))
+                        return new EmptyShelfBackJob(FullShelfPlace, eShelfType.SmallShelf);
+                    else
+                        return new EmptyShelfBackJob(FullShelfPlace, eShelfType.BigShelf);
                 }
             }
             else if (curJobStep.IsStep(SEND_FULL_SHELF_STEP.WAIT_LINE_RESPONSE))

AGVControl-ProductionLine/bin/Debug/Config/AgvMission.csv

@@ -46,4 +46,5 @@
 4C临时停车位1,MoveC4_STANDBY1,d5fc690b-f1a5-11ea-a03e-94c691a7387d
 4C临时停车位2,MoveC4_STANDBY2,90f4399f-f1a6-11ea-a03e-94c691a7387d
 临时停车位,MoveStandbyTemp,d6c32ad3-d64e-11ea-a3e4-94c691a7387d
-检查料架情况,CheckShelf,f3e46a3e-d734-11ea-a3e4-94c691a7387d
\ No newline at end of file
+检查料架情况,CheckShelf,f3e46a3e-d734-11ea-a3e4-94c691a7387d
+3D临时线,MoveS0,94a15e2c-cda7-11ea-a3e4-94c691a7387d
\ No newline at end of file

AGVControl-ProductionLine/bin/Debug/Config/AgvProductionLine.csv

@@ -31,3 +31,4 @@ C15,C15,10.85.199.60,4C-15,G15,a64bdbbb-cdac-11ea-a3e4-94c691a7387d
 4CFeederIn,C21,10.85.197.40,4C-FeederIn,C21,cb7f117b-ca88-11ea-9b28-0001299981d4
 4CFeederOut,C22,10.85.197.40,4C-FeederOut,C22,0fcf606c-d417-11ea-9b6b-0001299981d4
 C10,C10,10.85.199.59,4C-10线,G10,604b1c3c-ca4e-11ea-810b-00012999830e
+S0,S0,10.85.199.59,3D临时停留线,G10,604b1c3c-ca4e-11ea-810b-00012999830e

AGVControl-ProductionLine/bin/ProCopyClient.exe.config

@@ -4,6 +4,6 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
   </startup>
   <appSettings>
-    <add key="ProName" value="4F-AGV-LINE-送满料回来不回收非工单产线空料架" />
+    <add key="ProName" value="4F-AGV-LINE-产线AGV送3楼工单返回总往A5送问题" />
   </appSettings>
 </configuration>
\ No newline at end of file