分支自 SuZhouGuanHong/TaiYuanTaiZhong

dengjunjie
2024-06-28 1e38f44af86775a341e4d0e4411d24ad35e417d3
´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs
@@ -44,6 +44,11 @@
                {
                    var agvtask = agvtasks.Where(x => x.agv_tasktype == AGVTaskType).OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).FirstOrDefault();
                    if (agvtask != null) UpdateQueue(agvtaskService, agvtask);
                    //var tasks = agvtasks.Where(x => x.agv_tasktype == AGVTaskType).OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).ToList();
                    //foreach (var task in tasks)
                    //{
                    //    UpdateQueue(agvtaskService, task);
                    //}
                }
                #endregion
@@ -65,9 +70,9 @@
                if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString())//补空托任务
                {
                    var val = timeRepository.Find(x => x.management_name == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString()).FirstOrDefault().management_numericalvalue;
                    if (agvtask.agv_fromaddress == "" && agvtask.agv_toaddress.Contains("W"))
                    if (string.IsNullOrEmpty(agvtask.agv_fromaddress) && agvtask.agv_toaddress.Contains("W"))
                        GetStation.EmptyPalletStation(agvtask);
                    else if (agvtask.agv_fromaddress == "" && DateTime.Now - agvtask.agv_createtime >= TimeSpan.FromMinutes(val))
                    else if (string.IsNullOrEmpty(agvtask.agv_fromaddress) && DateTime.Now - agvtask.agv_createtime >= TimeSpan.FromMinutes(val))
                    {
                        if (agvtask.agv_tasknum.Contains("_"))
                        {
@@ -97,16 +102,24 @@
                                TargetLocation.stationType = agvtask.agv_materielid;
                                TargetLocation.heatNumber = stationinfo.heatNumber;
                                TargetLocation.Number = agvtask.jobID;
                                stationinfoRepository.Update(TargetLocation, true);
                                agvtaskService.Update(agvtask, true);
                                stationinfoRepository.Update(TargetLocation, x => new { x.location_state, x.billetID, x.stationType, x.heatNumber, x.Number }, true);
                                agvtaskService.Update(agvtask, x => new { x.agv_taskstate, x.agv_toaddress }, true);
                                WriteDBLog.Success("更新入库队列任务", $"任务编号:{agvtask.agv_tasknum}", "PCS");
                            }
                        }
                        else
                        {
                            if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString())
                            {
                                agvtask.agv_tasktype = AGVTaskTypeEnum.TaskType_OutsourceInbound.ToString();
                                agvtaskService.Update(agvtask, x => new { x.agv_tasktype }, true);
                            }
                        }
                    }
                }
                else if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceOutbound.ToString() || agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString())//外协库出库/AB库出库
                {
                    if (agvtask.agv_toaddress == "")
                    if (string.IsNullOrEmpty(agvtask.agv_toaddress))
                    {
                        if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString())
                            if (GetStation.QueueStation(agvtask.agv_fromaddress)) return;//限制一行一次只能出一个任务
@@ -127,7 +140,7 @@
                }
                else if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString())//移库外协
                {
                    if (agvtask.agv_toaddress == "")
                    if (string.IsNullOrEmpty(agvtask.agv_toaddress))
                    {
                        if (GetStation.QueueStation(agvtask.agv_fromaddress)) return;//限制一行一次只能出一个任务
                        var TargetLocation = StationTask.GetEmptyLocation(stationinfoRepository);