fix

业务工程/分拣库/WCS.WorkEngineering/Systems/AgvSystems.cs

@@ -234,6 +234,11 @@ namespace WCS.WorkEngineering.Systems
                                         {
                                             if (agv.Station.IsNullOrEmpty()) throw new Exception($"无有效放货地址");
                                             var dev = Device.All.First(x => x.Code == agv.Station);
+                                            var ph = new Device<IStation523>(Device.All.First(x => x.Code == agv.Station), World);
+                                            if (ph.Data.Status.HasFlag(StationStatus.PH_Status))
+                                            {
+                                                throw new Exception($"{agv.Station}站台有光电小车无法放货，请检查并处理");
+                                            }
                                             //调继续执行任务接口
                                             AgvApi.ContinueTask(agv.AgvID, dev.Code);
                                             break;

业务工程/分拣库/WCS.WorkEngineering/Systems/桁架码垛/桁架码垛工位任务结束处理.cs

@@ -46,7 +46,17 @@ namespace WCS.WorkEngineering.Systems
                 var taskCodes = taskList.Select(x => x.BarCode).ToList();
                 if (!obj.Data5.CmdType.HasFlag(TrussCmdType.End1))
                 {
-                    if (taskList.Count != TaskNoList.Count) throw new KnownException($"任务数量不一致!,请检查托盘任务信息", LogLevelEnum.Mid);
+                    if (TaskNoList.Count == 0) return;
+                    if (taskList.Count != TaskNoList.Count)
+                    {
+                        var taskIn = db.Queryable<WCS_TaskInfo>().Single(x => x.BarCode == palletizing.PalleCode && x.Type == TaskType.EnterDepot && x.Status < TaskStatus.Finish);
+                        if (taskIn == null)
+                        {
+                            WmsApi.ForceFinishBingPallet(palletizing.PalleCode, taskCodes, taskList.FirstOrDefault().WarehouseCode, obj.Entity.Code);
+                            return;
+                        }                       
+                    }
+                    //throw new KnownException($"任务数量不一致!,请检查托盘任务信息", LogLevelEnum.Mid);
                 }
                 var taskInfo = db.Queryable<WCS_TaskInfo>().Single(x => x.BarCode == palletizing.PalleCode && x.Type == TaskType.EnterDepot && x.Status < TaskStatus.Finish);
                 if (taskInfo == null)