4d备料

.vs/VSWorkspaceState.json

@@ -2,5 +2,6 @@
   "ExpandedNodes": [
   "ExpandedNodes": [
     ""
     ""
   ],
   ],
+  "SelectedNode": "\\AGVControl-ProductionLine.sln",
   "PreviewInSolutionExplorer": false
   "PreviewInSolutionExplorer": false
 }
 }
\ No newline at end of file

AGVControl-ProductionLine/BLL/LineWebService.cs

@@ -81,7 +81,6 @@ namespace BLL
                         Log.Info(string.Format("Unlock Request(POST) [emptyStation={0},rfid={1}]", emptyStation, rfid.ToUpper()));
                         Log.Info(string.Format("Unlock Request(POST) [emptyStation={0},rfid={1}]", emptyStation, rfid.ToUpper()));
                         if (!Common.missionManager.AddMission(value, rfid.ToUpper()))
                         if (!Common.missionManager.AddMission(value, rfid.ToUpper()))
                         {
                         {
-                            Common.log.Error("CreateEmptyRecycleTask(POST) 节点[" + value + "]不存在");
                             res = new Result() { Succeed = false, ResultData = null, ErrorMessage = "CreateEmptyRecycleTask failed: " + emptyStation + " rfid=" + rfid };
                             res = new Result() { Succeed = false, ResultData = null, ErrorMessage = "CreateEmptyRecycleTask failed: " + emptyStation + " rfid=" + rfid };
                         }
                         }
                         else
                         else
@@ -114,7 +113,6 @@ namespace BLL
 
 
                 if (!Common.missionManager.AddMission(value,RFID.ToUpper()))
                 if (!Common.missionManager.AddMission(value,RFID.ToUpper()))
                 {
                 {
-                    Common.log.Error("CreateEmptyRecycleTask 节点[" + value + "]不存在");
                     res = new Result() { Succeed = false, ResultData = null, ErrorMessage = "CreateEmptyRecycleTask failed: " + line };
                     res = new Result() { Succeed = false, ResultData = null, ErrorMessage = "CreateEmptyRecycleTask failed: " + line };
                 }
                 }
                 else
                 else

AGVControl-ProductionLine/bean/job/GoEmptyShelfLineJob.cs

@@ -406,11 +406,10 @@ namespace AGVControl
                     msg += runInfo;
                     msg += runInfo;
                     TakeEmptyStep.Msg = msg;
                     TakeEmptyStep.Msg = msg;
                     //4DfeederOut默认大料架
                     //4DfeederOut默认大料架
-                    if (agv.Place.Equals(SettingString.D4FeederOut))
-                        return new EmptyShelfBackJob(EmptyShelfPlace, eShelfType.BigShelf);
-                    else if (RFID.StartsWith("D"))
-                        return new EmptyShelfBackJob(EmptyShelfPlace, eShelfType.SmallShelf);
-                    
+                    //if (agv.Place.Equals(SettingString.D4FeederOut))
+                        //return new EmptyShelfBackJob(EmptyShelfPlace, eShelfType.BigShelf);
+                    if (RFID.StartsWith("D"))
+                        return new EmptyShelfBackJob(EmptyShelfPlace, eShelfType.SmallShelf);                    
                     else if (RFID.StartsWith("C"))
                     else if (RFID.StartsWith("C"))
                     {
                     {
                         return new EmptyShelfBackJob(EmptyShelfPlace, eShelfType.BigShelf);
                         return new EmptyShelfBackJob(EmptyShelfPlace, eShelfType.BigShelf);

AGVControl-ProductionLine/obj/Release/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs

+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

AgvClient/obj/Release/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs

+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

AgvClientTest/obj/Release/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs

+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

WebService/obj/Release/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs

+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]

WebServiceTest/obj/Release/.NETFramework,Version=v4.6.1.AssemblyAttributes.cs

+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName = ".NET Framework 4.6.1")]