Administrator 2 년 전
부모
커밋
6bba582b54

+ 2 - 0
Projects/永冠/WCS.Service/WebApi/WCSApi.cs

@@ -139,6 +139,8 @@ namespace WCS.Service.WebApi
                                     agvtask.Station = "2131";
                                 else if (ws == 3)
                                     agvtask.Station = "2143";
+                                else if (ws == 22)
+                                    agvtask.Station = "3001";
 
                                 db.Default.Set<WCS_AGVTask>().Add(agvtask);
                                 db.Default.SaveChanges();

+ 2 - 0
Projects/永冠/WCS.Service/WebApi/WMS/WMS.cs

@@ -164,6 +164,8 @@ namespace WCS.Service
             var tcode = (warehouse == "mwhouseputong" ? "TM" : "TY") + res.TunnelNum;
 
             var tunnel = Device.Find(tcode);
+            if (devCode == "3001")
+                devCode = "3045";
             var next = tunnel.GetNext(devCode);
             res.Memo1 = next.CODE;
             res.TunnelNum = tunnel.CODE;

+ 9 - 0
Projects/永冠/WCS.Service/Works/Stations/AGV交互.cs

@@ -349,6 +349,15 @@ namespace WCS.Service.Works.Stations
                                         throw new Exception($"{agvtask.Position}正在执行的叫料任务数量已达{qty},暂停出库");
                                     }
                                 }
+                                else if(station == "3001")
+                                {
+                                    var qty = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.叫料 && v.Status > AGVTaskStatus.新建 && v.Status < AGVTaskStatus.完成)
+                                    .Where(v => v.Position == agvtask.Position).Count();
+                                    if (Ltc.Do(qty, OutTaskQty => OutTaskQty >= 2))
+                                    {
+                                        throw new Exception($"{agvtask.Position}正在执行的叫料任务数量已达{qty},暂停出库");
+                                    }
+                                }
                                 else
                                 {
                                     var count2 = ProtocolProxy.WMS120Redis.Get("MaxLineCallTaskCount_1_2_3").ToInt();