Merge branch 'master' into wxw

Administrator

2024-02-21 95a533c6939aefd7e9370c4671168b53462d106e

 Wms/WMS.BLL/Logic/AllotLocation.cs

@@ -258,7 +258,7 @@
                sql += "order by ";
                sql += topOrBom == 0 ? "Layer desc, " : "Layer, ";
                sql += leftOrRight == 0 ? "[Column], " : "[Column] desc, ";
                sql += " Row desc Depth desc; ";
                sql += " Row desc, Depth desc; ";


                var locateList = db.Ado.SqlQuery<SysStorageLocat>(sql);