Merge branch 'master' into wxw

Administrator

2024-02-04 719ef250e88b8628ba5cbaeb4973b7c693e01694

 Wms/WMS.BLL/SysServer/StorageLocatServer.cs

@@ -631,7 +631,7 @@
        {
            try
            {
                string str = "select RoadwayNo,RoadwayName from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
                string str = "select RoadwayNo,RoadwayName,WareHouseNo from SysStorageRoadway where IsDel = @isdel and WareHouseNo = @warehouseno";
                
                List<RoadwayDto> roadway = Db.Ado.SqlQuery<RoadwayDto>(str, new
                {