优化

lss

2025-06-10 b2c8747a85762bc32f310a31fe84cad69b61104a

 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs

@@ -3,9 +3,11 @@
using NLog.Fluent;
using SqlSugar;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using static HH.WCS.JiaTong.dispatch.NDC;

@@ -200,6 +202,7 @@
        "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
        "U", "V", "W", "X", "Y", "Z"
    };

        /// <summary>
        /// 根据物料找托盘
        /// </summary>
@@ -209,7 +212,10 @@
        /// <returns></returns>
        internal static List<Location> GetLocByItemCode(string areaCode, string ItemCode, string lev)
        {

            List<Location> locs;


            var db = new SqlHelper<object>().GetInstance();
            var queryable = db.Queryable<Location>()
      .LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
@@ -241,7 +247,7 @@
            {
                locs = queryable.Where((a, b, c) => c.LEV == lev && c.S_BS_TYPE == "余料").ToList();
            }
            LogHelper.Info($"GetLocByItemCode=>查找余料,{JsonConvert.SerializeObject(locs)}");
            //   LogHelper.Info($"GetLocByItemCode=>查找余料,{JsonConvert.SerializeObject(locs)}");

            //没有余料则寻找全部物料
            if (locs.Count == 0)
@@ -262,8 +268,7 @@
                }
                LogHelper.Info($"GetLocByItemCode=>无余料,查找全部{JsonConvert.SerializeObject(queryable.ToList())}");

                //判断等级
                locs = queryable.Where((a, b, c) => char.ToUpper(lev) >= c.LEV).ToList();

                if (string.IsNullOrEmpty(lev))
                {
                    locs = queryable.ToList();
@@ -282,24 +287,65 @@
        /// 根据库区获取空托
        /// </summary>
        /// <param name="areaCode">库区编码</param>
        /// <param name="lev">物料等级</param>
        /// <param name="ItemCode">物料编码</param>
        /// <returns></returns>
        internal static Location GetLocByAreacode(string areaCode)
        internal static Location GetLocByAreacode(string areaCode, string type)
        {
            Location loc = new Location();
            var db = new SqlHelper<object>().GetInstance();
            string CntrCodeWith = "";
            if (type.Trim() == "PM")
            {
                CntrCodeWith = "MA";
            }
            else if (type.Trim() == "PN")
            {
                CntrCodeWith = "NA";
            }
            if (CntrCodeWith == "")
            {
                LogHelper.Info($"托盘类型{type}不在规定范围");
            }
            var query = db.Queryable<Location>()
       .LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
       .LeftJoin<CntrItemDetail>((a, b, c) => b.S_CNTR_CODE == c.S_CNTR_CODE)
       .Where((a, b, c) => a.S_AREA_CODE == areaCode && a.N_CURRENT_NUM == 1
                       && a.N_LOCK_STATE == 0
                       && b.S_CNTR_CODE != null
                       );
   .LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
   .LeftJoin<CntrItemDetail>((a, b, c) => b.S_CNTR_CODE == c.S_CNTR_CODE)
   .Where((a, b, c) => a.S_AREA_CODE == areaCode && a.N_CURRENT_NUM == 1
                   && a.N_LOCK_STATE == 0
                   && b.S_CNTR_CODE != null && b.S_CNTR_CODE.Contains(CntrCodeWith) && c.S_ITEM_CODE == null
                   );
            loc = query.First();


            return loc;
        }

        /// <summary>
        /// 分配电梯货位
        /// </summary>
        /// <returns></returns>
        internal static Location GetElevatorLoc()
        {
            var db = new SqlHelper<object>().GetInstance();
            Location location = new Location();
            //查找全部电梯，分配任务最少的电梯
            var devices = Settings.deviceInfos.Where(a => a.deviceType == 2 && a.enable == 1).ToList();
            string[] state = new string[] { "执行中", "开始取货", "取货完成" };
            Dictionary<int, string> dics = new Dictionary<int, string>();
            foreach (var deviceInfo in devices)
            {
                int mst = db.Queryable<WCSTask>().Where(a => a.S_TYPE.Contains("电梯") && state.Contains(a.S_B_STATE)).Count();
                dics.Add(mst, deviceInfo.TN_Location);
            }
            if (dics.Count > 0)
            {
                var dic = dics.OrderBy(a => a.Key).First();
                location = db.Queryable<Location>().Where(a => a.S_CODE == dic.Value).First();
                if (location == null)
                {
                    LogHelper.Info($"根据货位编码:{dic.Value},未找到对应货位");
                }
            }
            return location;
        }
        /// <summary>
        /// 根据物料编码，仓库编码获取托盘数量
        /// </summary>
@@ -479,15 +525,15 @@
        }

        /// <summary>
        /// 根据货位集合获取 没有容器 没有锁的货位
        /// 根据货位获取货位信息
        /// </summary>
        /// <param name="loc"></param>
        /// <returns></returns>
        internal static List<Location> GetLocListEmptyFree(List<string> loc)
        internal static Location GetLocByLoc(string loc)
        {
            //1.0 查货位容器表
            var db = new SqlHelper<object>().GetInstance();
            var list = db.Queryable<Location>().Where(a => loc.Contains(a.S_CODE) && a.N_CURRENT_NUM == 0 && a.S_LOCK_STATE.Trim() == "无").ToList();
            var list = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
            return list;

        }
@@ -518,7 +564,11 @@
                }
                else
                {
                    LogHelper.Info($"锁定货位{loc}成功");
                    LogHelper.Info($"锁定货位{loc}失败,重新锁");
                    Task.Run(() =>
                    {
                        LockLoc(loc, lockState);
                    });
                }
                return res;
            }