修改储位

chengsc

2025-04-03 f2df16d66c768d34d80320ea126c2e0fcfed1699

 Wms/WMS.BLL/SysServer/StorageLocatServer.cs

@@ -260,20 +260,27 @@
                }
                foreach (var item in _list)
                {
                    if (model.AisleNum > 0)
                    {
                        if (item.LocatNo != _list[0].LocatNo)
                    //if (model.AisleNum > 0)
                    //{
                    //if (item.LocatNo != _list[0].LocatNo)
                    //{
                    //    item.AisleOne = _list[0].LocatNo;
                    //}
                        if (model.AisleNum == 0)
                        {
                            item.AisleOne = _list[0].LocatNo;
                        }                        
                        if (model.AisleNum > 1)
                            if (item.LocatNo != _list[0].LocatNo)
                            {
                                item.AisleOne = _list[0].LocatNo;
                            }
                        }
                        if (model.AisleNum == 1)
                        {
                            if (item.LocatNo != _list[model.Col-1].LocatNo)
                            {
                                item.AisleTwo = _list[model.Col - 1].LocatNo;
                                item.AisleOne = _list[model.Col - 1].LocatNo;
                            }                                
                        }
                    }                    
                    //}                    
                    await LocatRst.AddAsync(item);
                }
                return _list.Count;
@@ -844,41 +851,19 @@
        {
            try
            {
                //一楼区域
                //List<string> row1 = new List<string>()
                //{
                //    "B01",
                //    "B02",
                //    "B03",
                //    "B04",
                //    "B05",
                //    "B06",
                //    "B07",
                //};
                ////二楼区域
                //List<string> row3 = new List<string>()
                //{
                //    "B11",
                //    "B12",
                //    "B13",
                //    "B14",
                //    "B15",
                //};
                string row1 = "'B01','B02','B03','B04','B05','B06','B07'";
                string row3 = "'B11','B12','B13','B14','B15'";
                string str = $"select * from SysStorageLocat where IsDel = '0' and WareHouseNo = '{wareHouseNo}' and ";
                if (row == "1")
                var area = Db.Queryable<SysStorageArea>().Where(m => m.IsDel == "0" && m.Status == "0" && m.WareHouseNo == wareHouseNo).ToList();
                
                var areaStr = new List<string>();
                if (row == "3")
                {
                    str += $" AreaNo in ({row1})";
                    areaStr = area.Where(m => m.AreaName.Contains("3楼")).Select(m => m.AreaNo).ToList();
                }
                else if (row == "3")
                else if (row == "4")
                {
                    str += $" AreaNo in ({row3})";
                    areaStr = area.Where(m => m.AreaName.Contains("4楼")).Select(m => m.AreaNo).ToList();
                }

                var list = Db.Ado.SqlQuery<SysStorageLocat>(str);

                //var list = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == wareHouseNo && row == "1" ? row1.Contains(m.AreaNo) : row3.Contains(m.AreaNo)).ToList();
                
                var list = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == wareHouseNo && areaStr.Contains(m.AreaNo)).ToList();

                return list;
            }