修改问题

wxw

3 天以前 3f5f0c666d20a58998a7a7cc4fc3047d86a0f5b3

 Wms/WMS.BLL/Logic/AllotLocation.cs

@@ -313,6 +313,22 @@
                var roadList = db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo) )
                    .GroupBy(m=>m.RoadwayNo).Select(m=>m.RoadwayNo).ToList();

                if (houseNo == "W02")
                {
                    //一楼巷道
                    var conveyList1 = new List<string>() { "LR01", "LR02", "LR03", "LR04", "LR05", "LR06", "LR07", "LR08" };
                    //二楼巷道
                    var conveyList2 = new List<string>() { "LR09", "LR10", "LR11", "LR12" };
                    if (ceng == "1")
                    {
                        roadList = roadList.Where(m => conveyList1.Contains(m)).ToList();
                    }
                    else if (ceng == "2")
                    {
                        roadList = roadList.Where(m => conveyList2.Contains(m)).ToList();
                    }
                }

                //数据字典(获取字典中仓库类型)
                var dic = db.Queryable<SysDictionary>().First(m => m.Id.ToString() == house.Type);
                switch (dic.DictName)
@@ -601,10 +617,10 @@
            foreach (var area in areaList)
            {
                var sql = $@"select * from SysStorageLocat where IsDel = 0 and Layer!= '3' and Flag = 0 and [Status] = 0 and RoadwayNo = '{roadwayNo}' and AreaNo = '{area}' and LocatNo not in({str}) ";
                if (!string.IsNullOrWhiteSpace(ceng))
                {
                    sql += $"and Layer = '{ceng}' ";
                }
                //if (!string.IsNullOrWhiteSpace(ceng))
                //{
                //    sql += $"and Layer = '{ceng}' ";        
                //}
                sql += "order by ";
                sql += topOrBom == 0 ? "Layer desc, " : "Layer, ";
                sql += leftOrRight == 0 ? "[Column], " : "[Column] desc, ";