杨前锦
2025-07-01 a93b0e99036c24b9bd58c79bf5e7364b1ba28bae
HH.WCS.Mobox3/HH.WCS.Mobox3.SXJK/wms/WMSHelper.cs
@@ -1360,12 +1360,22 @@
                }
                // 查询同批次入库锁数量,如果锁数量 >= 2 ,则不再从【空排】入库
                int lockNum = db.Queryable<Location>().Where(a => a.N_LOCK_STATE == 1 && a.S_LOCK_OP.Trim() == asnNo).Count();
                LogHelper.Info("同批次入库锁数量:" + lockNum, "Mobox");
                if (end == null && rowNum < 2 && lockNum < 2 )
                var lockRow = db.Queryable<Location>().Where(a => a.N_LOCK_STATE == 1 && a.S_LOCK_OP.Trim() == asnNo).Take(1).PartitionBy(l => new { l.S_AREA_CODE, l.N_ROW }).ToList();
                LogHelper.Info("同批次入库锁数量:" + lockRow.Count, "Mobox");
                if (end == null && rowNum < 2 && lockRow.Count < 2 )
                {
                    string fullerCode = null;
                    if (rowNum == 1)
                    if (lockRow.Count > 0)
                    {
                        var maxLoc = lockRow[0];
                        var fuller = db.Queryable<TN_Fuller>().Where(a => a.S_AREA_CODE == maxLoc.S_AREA_CODE && a.N_ROW == maxLoc.N_ROW).First();
                        if (fuller != null)
                        {
                            fullerCode = fuller.FULLER_CODE;
                        }
                    }
                    if (fullerCode == null && rowNum > 0 )
                    {
                        var maxLoc = listMaxCol[0];
                        var fuller = db.Queryable<TN_Fuller>().Where(a => a.S_AREA_CODE == maxLoc.S_AREA_CODE && a.N_ROW == maxLoc.N_ROW).First();
@@ -1503,5 +1513,21 @@
            }
            return weight;
        }
        /// <summary>
        ///  查询是否有需要移库的货位
        /// </summary>
        /// <returns></returns>
        public static float getFurHeight(string VENDOR)
        {
            float height = 800;
            var db = new SqlHelper<object>().GetInstance();
            var verdor = db.Queryable<TN_VendorList>().Where(a => a.VENDOR == VENDOR).First();
            if (verdor != null)
            {
                height = verdor.FURHEIGHT;
            }
            return height;
        }
    }
}