Merge branch 'master' into csc

chengsc

2025-03-05 f502d8fbef172fa55a0c75a0e0f53aec1cbd3144

 Wms/WMS.BLL/SysServer/StorageLocatServer.cs

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
using Model.ModelDto.SysDto;
@@ -82,7 +83,7 @@
                    Flag = m.Flag,
                    FlagName = GetFlag(m.Flag),
                    Make = m.Make,
                    MakeName = m.Make == "0"? "跑道": m.Make == "1" ? "储位":"",
                    MakeName = m.Make == "0" ? "跑道" : m.Make == "1" ? "储位" : "",
                    Depth = m.Depth,
                    Row = m.Row,
                    Column = m.Column,
@@ -139,7 +140,7 @@
        {
            try
            {
                var bl = LocatRst.EditStorageLocat(model.Id,model.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);
                var bl = LocatRst.EditStorageLocat(model.Id, model.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);

                return bl;
            }
@@ -274,7 +275,7 @@
                            {
                                c1 = c.ToString();
                            }
                             

                            q += await LocatRst.AddAsync(new SysStorageLocat()
                            {
                                LocatNo = r1 + l1 + c1,
@@ -289,7 +290,7 @@
                                Layer = c,
                                CreateUser = userId
                            });
                             

                        }
                    }
                }
@@ -338,7 +339,7 @@
                        //        //其余条件
                        //    }
                        //}
                        

                        q += await LocatRst.AddAsync(new SysStorageLocat()
                        {
                            // 区域+排+列+层
@@ -908,9 +909,9 @@
        /// </summary>
        /// <param name="roadwayNo">巷道</param>
        /// <returns></returns>
        public List<string> ByRoadwayGetRow(string roadwayNo)
        public List<string> ByRoadwayGetRow(string wareHouseNo, string roadwayNo)
        {
            string str = $"select Row from SysStorageLocat where IsDel = '0' and WareHouseNo = 'W01' and RoadwayNo = '{roadwayNo}' group by Row order by Row";
            string str = $"select Row from SysStorageLocat where IsDel = '0' and WareHouseNo = '{wareHouseNo}' and RoadwayNo = '{roadwayNo}' group by Row order by Row";

            List<string> row = Db.Ado.SqlQuery<string>(str);
            return row;
@@ -974,5 +975,63 @@
        }

        #endregion

        /// <summary>
        /// 获取储位信息(密集库)
        /// </summary>
        /// <param name="wareHouseNo">仓库</param>
        /// <param name="row">排</param>
        /// <returns></returns>
        public async Task<BordModelVM> GetFlatLegend(string wareHouseNo, int layer)
        {
            var list = await Db.Queryable<SysStorageLocat>().Where(s => s.WareHouseNo == wareHouseNo && s.Layer == layer && s.IsDel == "0").ToListAsync();
            BordModelVM listBord = new BordModelVM()
            {
                Col = 15,
                Row = 18
            };

            foreach (var modLocat in list)
            {
                SlotsVm mod = new SlotsVm()
                {
                    SlotColumn = modLocat.Column,
                    SlotRow = modLocat.Row,
                    SlotCode = modLocat.LocatNo,
                    //SlotStatusCls = modLocat.Flag!="0"? "eight": modLocat.Status == "0"? "zero":,
                    Make = modLocat.Make
                };
                if (modLocat.Flag != "0")
                    mod.SlotStatusCls = "eight";
                switch (modLocat.Status)
                {
                    case "0":
                        mod.SlotStatusCls = "zero";
                        break;
                    case "1":
                        mod.SlotStatusCls = "one";
                        break;
                    case "2":
                        mod.SlotStatusCls = "two";
                        break;
                    case "3":
                        mod.SlotStatusCls = "three";
                        break;
                    case "4":
                        mod.SlotStatusCls = "four";
                        break;
                    case "5":
                        mod.SlotStatusCls = "five";
                        break;
                    default:
                        break;
                }
                listBord.SlotsVm.Add(mod);
            }

            return listBord;

        }

    }
}