分支自 SuZhouGuanHong/TaiYuanTaiZhong

dengjunjie
2024-05-07 46f7bf1ee45c97b688a370bbe45d149efb403cc1
´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs
@@ -157,7 +157,9 @@
            {
                if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString())//空托任务
                {
                    if (agvtask.agv_fromaddress == "" && DateTime.Now - agvtask.agv_createtime >= TimeSpan.FromMinutes(2))
                    if (agvtask.agv_fromaddress == "" && agvtask.agv_toaddress.Contains("W"))
                        GetStation.EmptyPalletStation(agvtask);
                    else if (agvtask.agv_fromaddress == "" && DateTime.Now - agvtask.agv_createtime >= TimeSpan.FromMinutes(2))
                    {
                        if (agvtask.agv_tasknum.Contains("_"))
                        {
@@ -167,9 +169,8 @@
                        }
                        else
                            GetStation.EmptyPalletStation(agvtask);
                        WriteDBLog.Success("更新空托队列任务", $"任务编号:{agvtask.agv_tasknum}", "PCS");
                    }
                    WriteDBLog.Success("更新空托队列任务", $"任务编号:{agvtask.agv_tasknum}", "PCS");
                }
                else if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceInbound.ToString() || agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString())//外协库入库/AB库入库
                {
@@ -200,6 +201,8 @@
                {
                    if (agvtask.agv_toaddress == "")
                    {
                        if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString())
                            if (GetStation.QueueStation(agvtask.agv_fromaddress)) return;//限制一行一次只能出一个任务
                        var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("S01001") && (x.tray_status == TrayStateEnum.EmptyTray.ToString() || x.location_state == LocationStateEnum.Empty.ToString()) && x.enable).ToList();
                        foreach (var EmptyStation in EmptyStations)
                        {
@@ -218,6 +221,7 @@
                {
                    if (agvtask.agv_toaddress == "")
                    {
                        if (GetStation.QueueStation(agvtask.agv_fromaddress)) return;//限制一行一次只能出一个任务
                        var TargetLocation = StationTask.GetEmptyLocation(stationinfoRepository);
                        if (TargetLocation != null)
                        {