2025-06-17日提交

Tjiny

2025-06-17 7e47d1856a1db4367ce103a8b7de37fb0f3590b0

 HH.WCS.Mobox3.RiDong/generalMethod/LocationMethod.cs

@@ -131,8 +131,8 @@
            var locations = sqlSugarClient.Queryable<Location>()
                .Where(p => p.N_PRIORITY == priority && p.N_CURRENT_NUM == 0 && p.N_LOCK_STATE == 0 && p.N_PURPOSE == 1).ToList();
            
            // 优先查询今日份任务中未完成的（等待，执行中）
            var notQueryList = AdoSqlMethod<Operation>.QueryList(p=>p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today);
            var notQueryList = AdoSqlMethod<Task>
                .QueryList(p=> p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today && (p.N_TYPE == 1 || p.N_TYPE == 3) && p.N_SCHEDULE_TYPE == 2);

            if (notQueryList.Count > 0)
            {
@@ -140,8 +140,8 @@

                foreach (var item in groupBy)
                {
                    if (item.Key == 1 || item.Key == 2 || item.Key == 3 ||
                        item.Key == 4)
                    if ((item.Key == 1 || item.Key == 2 || item.Key == 3 ||
                        item.Key == 4) )
                    {
                        locations = locations.Where(p=>p.N_ROADWAY != item.Key).ToList();
                    }
@@ -173,7 +173,28 @@
            // 查询出所有该优先级的可用货位
            var locations = sqlSugarClient.Queryable<Location>()
                .Where(p => p.N_PRIORITY == priority && p.N_CURRENT_NUM == 0 && p.N_LOCK_STATE == 0 && p.N_PURPOSE == 1).ToList();
                
            
            var notQueryList = AdoSqlMethod<Task>
                .QueryList(p=> p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today && (p.N_TYPE == 1 || p.N_TYPE == 3) && p.N_SCHEDULE_TYPE == 2);

            if (notQueryList.Count > 0)
            {
                var groupBy = notQueryList.GroupBy(p=>p.N_ROADWAY);

                foreach (var item in groupBy)
                {
                    if (item.Key == 1 || item.Key == 2 || item.Key == 3 ||
                        item.Key == 4)
                    {
                        locations = locations.Where(p=>p.N_ROADWAY != item.Key).ToList();
                    }
                    else if (item.Key == 5 && item.ToList().Count >= 3)
                    {
                        locations = locations.Where(p=>p.N_ROADWAY != item.Key).ToList();
                    }
                }
            }
            
            // 存在该优先级的可用货位
            if (locations.Count > 0)
            {
@@ -198,8 +219,8 @@
                var locations = sqlSugarClient.Queryable<Location>()
                    .Where(p => p.N_PRIORITY == i && p.N_CURRENT_NUM == 0 && p.N_LOCK_STATE == 0 && p.N_PURPOSE == 1).ToList();
                
                // 优先查询今日份任务中未完成的（等待，执行中）
                var notQueryList = AdoSqlMethod<Operation>.QueryList(p=>p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today);
                var notQueryList = AdoSqlMethod<Task>
                    .QueryList(p=> p.N_B_STATE < 2 && p.T_CREATE.Date == DateTime.Today && (p.N_TYPE == 1 || p.N_TYPE == 3) && p.N_SCHEDULE_TYPE == 2);

                if (notQueryList.Count > 0)
                {