分支自 SuZhouGuanHong/TaiYuanTaiZhong
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
dengjunjie
2024-03-26 874ceff175a7308da045943fb7def1f6c6560a51 
 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs


@@ -43,7 +43,7 @@


                            var area = task.agv_Traytype == "SmallTray" ? "11" : "10";


                            //找1库区的空托位


                            var EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity > 0 && x.stationCode.Contains("A") && x.location_state == "Stroge"/*LocationStateEnum.Stroge.ToString()*/ && x.enable)


                                .OrderBy(x => x.line).OrderByDescending(x => x.column).FirstOrDefault();


                                .OrderBy(x => x.column).OrderBy(x => x.line).FirstOrDefault();




                            #region ä¸€ä¸ªåŒºåŸŸåªèƒ½æœ‰ä¸€ä¸ªç©ºæ‰˜ä»»åŠ¡


                            //bool ok = false;


@@ -55,6 +55,7 @@


                            #endregion


                            if (EmptyStation == null)


                                EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity > 0 && x.stationCode.Contains(area == "10" ? "D" : "C") && x.enable).OrderByDescending(x => x.column).FirstOrDefault();


                            if (EmptyStation == null) continue;


                            #region åº“内存在任务占用


                            if (EmptyStation.location_state == LocationStateEnum.Busy.ToString())


                                continue;