lss
2025-06-27 cee2bc19f3e1b0cf528affb23e3819bf94672eea
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
@@ -1321,15 +1321,14 @@
                            loc = StorageCompute(itemcode, areacode);
                            if (loc == null)
                            {
                                loc = emptyRow(areacode);
                                if (loc == null)
                                {
                                    result.code = "1";
                                    result.msg = $"库区:{areacode}没有可用货位";
                                    LogHelper.Info($" {result.msg}");
                                    AddErrorInfo("查找库区失败", result.msg, Source);
                                return result;
                                    // LogHelper.Info($"库区:{areacode}没有可用货位");
                                }
                            }
                            //else
                            //{
@@ -1364,6 +1363,7 @@
                            AddErrorInfo("货位有锁", result.msg);
                            return result;
                        }
                        LogHelper.Info("创建空托回库任务,终点货位为空:" + JsonConvert.SerializeObject(loc));
                        //创建wcs任务
                        var wcsTask = new WCSTask
                        {
@@ -2557,60 +2557,22 @@
        {
            //Location result = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0).First();
            var db = new SqlHelper<object>().GetInstance();
            Location result = new Location();
            var list = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0).ToList();
            Location result = null;
            // 867C567A-183C-413B-9891-15D8F6DE1620
            // var aaa = db.Deleteable<Location>(a => a.S_ID == "867C567A-183C-413B-9891-15D8F6DE1620").ExecuteCommand();
            // var aaa = db.Deleteable<Location>(a => a.S_ID.Trim() == "867C567A-183C-413B-9891-15D8F6DE1620").ExecuteCommand();
            LogHelper.Info($"方法:StorageCompute");
            var list = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE == areacode && a.N_LOCK_STATE == 0 && a.N_ROW > 0 && a.N_COL > 0).ToList();
            LogHelper.Info($"创建空托回库任务,终点货位集合:根据库区编码:{areacode}" + list.Count);
            //list.RemoveAll(a => string.IsNullOrEmpty(a.S_CODE.Trim()) || a.S_CODE == null || string.IsNullOrWhiteSpace(a.S_CODE.Trim()));
            list = list.FindAll(a => a.N_ROW > 0 && a.N_COL > 0);
            LogHelper.Info("创建空托回库任务,终点货位集合过滤:" + list.Count);
            if (list.Count > 0)
            {
                result= FindEndcolByLocList(list);
            }
            //查询所有有托盘的排没锁的排
            // var list = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0).OrderByDescending(a => a.N_COL).Take(1).PartitionBy(a => a.N_ROW).ToList();
            //if (list.Count > 0)
            //{
            //    for (int i = 0; i < list.Count; i++)
            //    {
            //        LogHelper.Info($"有托盘排号{list[i].N_ROW},物料编码{itemcode},库区{areacode}");
            //        //查询货位绑定托盘
            //        var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == list[i].S_CODE).First();
            //        if (cntr != null)
            //        {
            //            //查询托盘物料信息
            //            var iteminfo = ContainerHelper.GetCntrItemRel(cntr.S_CNTR_CODE).FirstOrDefault();
            //            if (string.IsNullOrEmpty(itemcode))//空托入库
            //            {
            //                if (iteminfo == null)
            //                {
            //                    //物料相同入货位后一位货位
            //                    result = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => a.S_AREA_CODE.Trim() == areacode && a.N_ROW == list[i].N_ROW && a.N_COL > list[i].N_COL && a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM == 0).First();
            //                }
            //            }
            //            else//满拖入库
            //            {
            //                if (iteminfo != null)
            //                {
            //                    if (iteminfo.S_ITEM_CODE == itemcode)
            //                    {
            //                        //物料相同入货位后一位货位
            //                        result = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => a.S_AREA_CODE.Trim() == areacode && a.N_ROW == list[i].N_ROW && a.N_COL > list[i].N_COL && a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM == 0).First();
            //                    }
            //                }
            //            }
            //            if (result != null)
            //            {
            //                return result;
            //            }
            //        }
            //        else
            //        {
            //            LogHelper.Info($"根据货物编码{list[i].S_CODE}未找到托盘货位绑定关系");
            //        }
            //    }
            //}
            return result;
        }
@@ -2838,7 +2800,7 @@
                        //当前排没有锁并且有空位置
                        // other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y").FirstOrDefault();
                        other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0).FirstOrDefault();
                        other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && !string.IsNullOrEmpty(a.S_CODE.Trim()) && !string.IsNullOrWhiteSpace(a.S_CODE.Trim())).FirstOrDefault();
                        //if (full == null)
                        //{
                        //    //没有满位,那就找最小的空位
@@ -2854,13 +2816,15 @@
                        //    other = db.Queryable<Location>().OrderBy(a => a.N_LAYER).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "禁用") && a.S_AREA_CODE == other.S_AREA_CODE && a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
                        //    //LogHelper.Info($"禁用选择后一个货位{result}", "成品");
                        //}
                        if (other != null)
                        {
                            if (other.S_CODE != null && !string.IsNullOrEmpty(other.S_CODE))
                        {
                            end = other;
                            break;
                        }
                        }
                    }
                }
                return end;