lss
2025-06-19 ae75edc771b0161f90f3e5a596d13bee8a4b71cc
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs
@@ -220,7 +220,7 @@
            var queryable = 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.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == areaCode);
      .Where((a, b, c) => a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == areaCode );
            //六位码匹配前六位,其他的全部配置
            if (ItemCode.Trim().Length == 6)
            {
@@ -255,7 +255,7 @@
                queryable = 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.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == areaCode);
                    .Where((a, b, c) => a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == areaCode );
                //六位码匹配前六位,其他的全部配置
                if (ItemCode.Trim().Length == 6)
                {
@@ -293,11 +293,11 @@
            Location loc = new Location();
            var db = new SqlHelper<object>().GetInstance();
            string CntrCodeWith = "";
            if (type.Trim() == "PM")
            if (type.Trim().Contains("MA"))
            {
                CntrCodeWith = "MA";
            }
            else if (type.Trim() == "PN")
            else if (type.Trim().Contains("NA"))
            {
                CntrCodeWith = "NA";
            }
@@ -621,16 +621,32 @@
            {
                db.BeginTran();
                var lcrList = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc).ToList();
                //if (!string.IsNullOrEmpty(location.S_NOTE) && lcrList.Count > 0)
                //{
                //    if (location.S_NOTE == "叠盘" || location.S_NOTE.Trim() == "片胶堆叠位")
                //    {
                //        LogHelper.Info("叠盘货位删除托盘");
                //        cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();
                //    }
                //}
                if (lcrList.Count > 0)
                {
                    cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();
                }
                LogHelper.Info($"BindingLoc:开始解绑容器:{cntrs}");
                var count = db.Deleteable<LocCntrRel>().Where(it => cntrs.Contains(it.S_CNTR_CODE.Trim()) && it.S_LOC_CODE.Trim() == loc).ExecuteCommand();
                location.N_CURRENT_NUM = lcrList.Count - count;
                location.S_LOCK_STATE = "无";
                location.N_LOCK_STATE = 0;
                db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM, it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand();
                LogHelper.Info($"BindingLoc:解绑容器:{cntrs},成功");
                db.CommitTran();
                res = true;
            }
            catch (Exception ex)
            {
                LogHelper.Info($"BindingLoc Error:{ex}");
                db.RollbackTran();
            }
            return res;