林豪 左 hace 1 año
padre
commit
75f0e27896

+ 1 - 0
WCS.WorkEngineering/Systems/DataCollectionSysyem.cs

@@ -9,6 +9,7 @@ using WCS.Entity.Protocol.Protocol.SRM;
 using WCS.Entity.Protocol.Protocol.Station;
 using WCS.WorkEngineering.Extensions;
 using WCS.WorkEngineering.Protocol.DataStructure;
+using WCS.WorkEngineering.Worlds;
 
 namespace WCS.WorkEngineering.Systems
 {

+ 3 - 0
WCS.WorkEngineering/Systems/RGVSystems.cs

@@ -44,6 +44,9 @@ namespace WCS.WorkEngineering.Systems
 
         public override void Do(Device<IRGV520, IRGV521, IBCR81> obj)
         {
+            //var dev1 = new Device<IStation520>(Device.All.First(x => x.Code == "1602"), World);
+            //dev1.Data.TaskNumber = 0;
+            //dev1.Data.GoodsEnd=0;
 
             if (obj.Data.VoucherNo != obj.Data2.VoucherNo) throw new KnownException($"凭证号不一致,DB520:{obj.Data.VoucherNo}-DB521:{obj.Data2.VoucherNo}", LogLevelEnum.High);
             if (obj.Data2.WorkMode != RGVWorkMode.Automatic) return;

+ 2 - 0
WCS.WorkEngineering/Systems/环形库/环形库码垛结束.cs

@@ -51,6 +51,8 @@ namespace WCS.WorkEngineering.Systems.环形库
                     return;
                 }
 
+                if (taskInfo.Status != TaskStatus.WaitingToExecute) return;
+
                 foreach (var item in tasks)
                 {
                     item.Status = TaskStatus.Finish;

+ 1 - 1
WCS.WorkEngineering/WebApi/Controllers/AgvApi.cs

@@ -104,7 +104,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
                     positionCode="LXSS1",
                     type="00"
                 }
-            }, "1", taskCode, "LX02", "1");
+            }, "1", taskCode, "ZTGT30", "1");
         }
 
         /// <summary>