分支自 SuZhouGuanHong/TaiYuanTaiZhong

dengjunjie
2024-05-19 429bb4abbaea6fd6be33dcf62735d4ada5070b63
´úÂë¹ÜÀí/WMS/WMS_Server/WIDESEA_WMS/Common/GetStation/EmptyTrayIn.cs
@@ -36,6 +36,32 @@
            }
        }
        /// <summary>
        /// èŽ·å–å¯å…¥ç©ºæ‰˜è´§ä½
        /// </summary>
        public static dt_stationinfo GetEmptyTrayStation(Idt_stationinfoRepository stationinfoRepository,dt_agvtask agv_task)
        {
            dt_stationinfo EmptyStation = null;
            #region æ£€æµ‹ä¸Šæ–™çš„空托叠盘
            if (agv_task.agv_fromaddress.Contains("S"))
            {
                var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("DD") && x.quantity < 5 && x.enable).ToList();
                EmptyStation = EmptyStations.Where(x => x.tray_type == agv_task.agv_Traytype && x.quantity < 5 && x.location_state == LocationStateEnum.Stroge.ToString()).FirstOrDefault();
                if (EmptyStation == null)
                    EmptyStation = EmptyStations.Where(x => x.location_state == LocationStateEnum.Empty.ToString() && x.quantity == 0).FirstOrDefault();
                if (EmptyStation == null)
                {
                    var EmptyD = EmptyStations.Where(x => x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).OrderByDescending(x => x.quantity).FirstOrDefault();
                    if (EmptyD != null) CreateEmptyTrayIn(stationinfoRepository, EmptyD);
                }
            }
            #endregion
            else
            {
                EmptyStation = GetStation.EmptyPalletStation1(agv_task.agv_Traytype == "SmallTray" ? "11" : "10");
            }
            return EmptyStation;
        }
        /// <summary>
        /// åˆ›å»ºç©ºæ‰˜å ç›˜å…¥åº“任务
        /// </summary>
        /// <param name="stationinfoRepository"></param>
@@ -48,7 +74,7 @@
            {
                if (agvtaskRepository.Find(x => x.agv_fromaddress == EmptyStation.stationCode || x.agv_toaddress == EmptyStation.stationCode).Any()) return;
                var area = EmptyStation.tray_type == "SmallTray" ? "11" : "10";
                var toEmptyStation = GetStation.EmptyPalletStation(area);
                var toEmptyStation = GetStation.EmptyPalletStation1(area);
                if (toEmptyStation != null)
                {
                    #region åŒä¸€ä¸ªç©ºæ‰˜ä½åªèƒ½åŒæ—¶ç”Ÿæˆä¸€ä¸ªç©ºæ‰˜ä»»åŠ¡