优化

lss

2025-06-24 3e870a218efe18db4eeb099632aac12a947a9e92

 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs

@@ -880,6 +880,7 @@
                        return result;
                    }


                    loc = StorageCompute(itemcode, areacode);

                    if (loc != null)
@@ -1024,6 +1025,10 @@
                    {
                        areacode = whcode.PMK;
                        cntrType = "PM";
                    }
                    else if (model.PartNumber.StartsWith("32"))
                    {
                        areacode = whcode.ZCW2;
                    }
                    else
                    {
@@ -1623,36 +1628,6 @@
                {



                    #region 余料返回根据托盘找出库任务
                    //余料返回根据托盘找出库任务
                    //msts = WCSHelper.GetTaskBycntrcode(model.Rfid);
                    //if (msts.Count() > 0)
                    //{
                    //    msts.RemoveAll(a => string.IsNullOrEmpty(a.S_CNTR_CODE));
                    //    mst = msts.OrderByDescending(a => a.T_CREATE).FirstOrDefault();
                    //}
                    //if (mst != null)
                    //{
                    //    areacode = mst.S_START_AREA;
                    //}
                    //else
                    //{
                    //    result.code = "1";
                    //    result.msg = $"创建任务失败，根据托盘编码{model.Rfid}未找到托盘出库任务";
                    //    AddErrorInfo("查找任务失败", result.msg);
                    //    return result;
                    //}
                    //if (string.IsNullOrEmpty(areacode))
                    //{
                    //    LogHelper.Info($"创建任务失败，根据托盘编码{model.Rfid}找到出库任务{mst.S_CODE}的起点库区为空");
                    //    result.code = "1";
                    //    result.msg = $"创建任务失败，根据托盘编码{model.Rfid}找到出库任务{mst.S_CODE}的起点库区为空";
                    //    AddErrorInfo("查找库区失败", result.msg);
                    //    return result;
                    //}
                    #endregion

                    #region 判断托盘绑定货位是否和下发绑定起点相同
                    var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
                    if (CntrLoc != null)
@@ -1699,17 +1674,18 @@
                                //    loc = emptyRow(areacode);
                                //}
                            }
                            else if (model.PartNumber.StartsWith("32"))
                            {
                                areacode = whcode.ZCW2;
                            }
                            else
                            {


                                if (model.PartNumber.StartsWith("3"))
                                {
                                    areacode = whcode.ZCW;
                                }
                                else
                                {

                                    result.code = "1";
                                    result.msg = $"创建任务失败，物料号{model.PartNumber}不属于规定物料";
                                    LogHelper.Info($"ItemBack：{result.msg}");
@@ -2568,15 +2544,24 @@
        /// <returns></returns>
        internal static Location StorageCompute(string itemcode, string areacode)
        {
            //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 = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0 ).First();
            Location result = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y").First();
            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();
            if (list.Count > 0)
            {
                FindEndcolByLocListLock(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)

            // 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();
@@ -2839,8 +2824,8 @@
                    {
                        Location other = null;
                        //当前排没有锁并且有空位置
                        //先找满位，然后后面一层要么是空，要么不存在
                        /// 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 && 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();
                        //if (full == null)
                        //{
@@ -2877,6 +2862,57 @@
        }

        /// <summary>
        /// 找终点空货位计算排锁
        /// </summary>
        /// <param name="locations"></param>
        /// <returns></returns>
        internal static Location FindEndcolByLocListLock(List<Location> locations)
        {
            try
            {
                var db = new SqlHelper<object>().GetInstance();
                Location end = null;
                //根据终点货位找空闲货位
                var rows = locations.Select(a => a.N_ROW).Distinct().ToList();
                for (int i = 0; i < rows.Count; i++)
                {
                    var rowList = locations.Where(r => r.N_ROW == rows[i]).ToList();
                    if (rowList.Count(a => a.S_LOCK_STATE != "无") == 0 && rowList.Count(a => a.N_CURRENT_NUM == 0) > 0)
                    {
                        Location other = null;
                        //当前排没有锁并且有空位置
                        //先找满位，然后后面一位要么是空，要么不存在
                        var full = rowList.OrderByDescending(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 1).FirstOrDefault();
                        if (full == null)
                        {
                            //没有满位，那就找最小的空位
                            other = rowList.OrderBy(a => a.N_COL).FirstOrDefault();
                        }
                        else
                        {
                            other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_COL > full.N_COL).FirstOrDefault();
                        }
                    
                        if (other != null)
                        {
                            end = other;
                            break;

                        }

                    }
                }
                return end;
            }
            catch (Exception)
            {

                throw;
            }

        }

        /// <summary>
        /// 找起点满货位
        /// </summary>
        /// <param name="locations"></param>