Merge branch 'master' into wxw

Administrator

2024-02-21 95a533c6939aefd7e9370c4671168b53462d106e

Merge branch 'master' into wxw

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -156,12 +156,20 @@
                switch (model.Type)//0：原料 1：包材 2：成品 3：耗材 4：半成品
                {
                    case "0"://成品入库
                        skuType = "(2)";
                        break;
                    case "3"://退货入库
                        skuType = "(2)";
                        break;
                    case "5"://其它入库
                        skuType = "(0,1,3)";
                        break;
                    case "6"://代储入库
                        skuType = "(2)";
                        break;
                    case "1"://采购入库
                        skuType = "(0,1,3)";
                        break;
                    case "4"://车间余料退回入库
                        skuType = "(0,1,3)";
                        break;

 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);