优化入库逻辑

dengjunjie

2024-05-23 a3c63f891be17d0884198b9d92e82e23234ffe8e

优化入库逻辑

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs

@@ -47,100 +47,6 @@
                }
                #endregion

                #region MyRegion
                //var tasks = agvtaskService.Find(x => x.agv_taskstate == "Queue").OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).ToList();
                //foreach (var task in tasks)
                //{
                //    try
                //    {
                //        if (task.agv_tasktype == "TaskType_EmptyPallet")//空托任务
                //        {
                //            if (task.agv_fromaddress == "" && DateTime.Now - task.agv_createtime >= TimeSpan.FromMinutes(2))
                //            {
                //                if (task.agv_tasknum.Contains("_"))
                //                {
                //                    string mainTaskNum = task.agv_tasknum.Split('_')[0];
                //                    if (agvtaskService.Find(x => x.agv_tasknum == mainTaskNum && task.agv_taskstate != "Executing" && task.agv_taskstate != "Create").Any() || !agvtaskService.Find(x => x.agv_tasknum == mainTaskNum).Any())
                //                        GetStation.EmptyPalletStation(task);
                //                }
                //                else
                //                    GetStation.EmptyPalletStation(task);

                //                WriteDBLog.Success("更新空托队列任务", $"任务编号：{task.agv_tasknum}", "PCS");
                //                continue;
                //            }
                //        }
                //        else if (task.agv_tasktype == "TaskType_OutsourceInbound" || task.agv_tasktype == "TaskType_Inbound")//外协库入库/AB库入库
                //        {
                //            if (task.agv_toaddress == "")
                //            {
                //                var stationinfo = stationinfoRepository.Find(x => x.stationCode == task.agv_fromaddress).FirstOrDefault();
                //                var work = workinfoRepository.Find(x => x.workOrder == stationinfo.Number && x.drawingNo == stationinfo.stationType && x.heatID == stationinfo.heatNumber && x.processCode == "17").FirstOrDefault();
                //                var TargetLocation = task.agv_tasktype == "TaskType_Inbound" ? GetLocation.GetEmptyLocation(stationinfoRepository, work, task) : StationTask.GetEmptyLocation(stationinfoRepository);
                //                if (TargetLocation != null)
                //                {
                //                    if (agvtaskService.Find(x => x.agv_toaddress == TargetLocation.stationCode).Any()) continue;
                //                    task.agv_taskstate = "Create";
                //                    task.agv_toaddress = TargetLocation.stationCode;
                //                    TargetLocation.location_state = LocationStateEnum.InBusy.ToString();
                //                    TargetLocation.billetID = stationinfo.billetID;
                //                    TargetLocation.stationType = task.agv_materielid;
                //                    TargetLocation.heatNumber = stationinfo.heatNumber;
                //                    TargetLocation.Number = task.jobID;
                //                    stationinfoRepository.Update(TargetLocation, true);
                //                    agvtaskService.Update(task, true);
                //                    WriteDBLog.Success("更新入库队列任务", $"任务编号：{task.agv_tasknum}", "PCS");
                //                    continue;
                //                }
                //            }
                //        }
                //        else if (task.agv_tasktype == "TaskType_OutsourceOutbound" || task.agv_tasktype == "TaskType_Outbound")//外协库出库/AB库出库
                //        {
                //            if (task.agv_toaddress == "")
                //            {
                //                var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("S01001") && (x.tray_status == "EmptyTray" || x.location_state == "Empty") && x.enable).ToList();
                //                foreach (var EmptyStation in EmptyStations)
                //                {
                //                    if (agvtaskService.Find(x => x.agv_toaddress == EmptyStation.stationCode).Any()) continue;
                //                    task.agv_taskstate = "Create";
                //                    task.agv_toaddress = EmptyStation.stationCode;
                //                    EmptyStation.location_state = LocationStateEnum.Busy.ToString();
                //                    stationinfoRepository.Update(EmptyStation, true);
                //                    agvtaskService.Update(task, true);
                //                    WriteDBLog.Success("更新出库队列任务", $"任务编号：{task.agv_tasknum}", "PCS");
                //                    return;
                //                }
                //            }
                //        }
                //        else if (task.agv_tasktype == "TaskType_OutsourceCarry")//移库外协
                //        {
                //            if (task.agv_toaddress == "")
                //            {
                //                var TargetLocation = StationTask.GetEmptyLocation(stationinfoRepository);
                //                if (TargetLocation != null)
                //                {
                //                    if (agvtaskService.Find(x => x.agv_toaddress == TargetLocation.stationCode).Any()) continue;

                //                    task.agv_taskstate = "Create";
                //                    task.agv_toaddress = TargetLocation.stationCode;
                //                    TargetLocation.location_state = LocationStateEnum.OutBusy.ToString();
                //                    TargetLocation.stationType = task.agv_materielid;
                //                    stationinfoRepository.Update(TargetLocation, true);
                //                    agvtaskService.Update(task, true);
                //                    WriteDBLog.Success("更新移库外协队列任务", $"任务编号：{task.agv_tasknum}", "PCS");
                //                    continue;
                //                }
                //            }
                //        }
                //    }
                //    catch (Exception ex)
                //    {
                //        //WriteDBLog.Error("更新队列任务", $"错误信息：{ex.Message}", "PCS");
                //        WriteLog.Write_Log("更新队列任务", "更新失败", "", $"错误信息：{ex.Message}");
                //    }
                //}
                #endregion

            }
            catch (Exception ex)
            {

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ÐÂÎļþ¼Ð/GetLocation.cs

@@ -121,13 +121,14 @@
                    #endregion

                    #region å¯»æ‰¾å¯¹åº”库区空货位
                    //var TargetLocations = area1 == "4" ? stationinfoRepository.Find(x => x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == "4").OrderBy(x => x.line).ThenBy(x => x.column).ToList()
                    //    : stationinfoRepository.Find(x => x.location_state == LocationStateEnum.Empty.ToString() && x.enable && (x.area == "2" || x.area == "3")).OrderBy(x => x.line).ThenBy(x => x.column).ToList();
                    //foreach (var Location in TargetLocations)
                    //{
                    //    if (stationinfoRepository.Find(x => x.line == Location.line && x.area == Location.area && x.stationType == agvtask.agv_materielid).Any())
                    //        if (!stationinfoRepository.Find(x => x.line == Location.line && x.area == Location.area && x.location_state == LocationStateEnum.OutBusy.ToString()).Any()) return Location;
                    //}

                    var TargetLocations = area1 == "4" ? stationinfoRepository.Find(x => x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == "4").OrderBy(x => x.line).ThenBy(x => x.column).ToList()
                        : stationinfoRepository.Find(x => x.location_state == LocationStateEnum.Empty.ToString() && x.enable && (x.area == "2" || x.area == "3")).OrderBy(x => x.line).ThenBy(x => x.column).ToList();
                    foreach (var Location in TargetLocations)
                    {
                        if (stationinfoRepository.Find(x => x.line == Location.line && x.area == Location.area && x.stationType == agvtask.agv_materielid).Any())
                            if (!stationinfoRepository.Find(x => x.line == Location.line && x.area == Location.area && x.location_state == LocationStateEnum.OutBusy.ToString()).Any()) return Location;
                    }
                    #endregion

                    #region æœªæ‰¾åˆ°åº“存或当前库存行已满,寻找新的一行