Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -1222,10 +1222,10 @@
                throw Oops.Bah("库存信息中不存在该托盘信息，请检查!");
            }

            if (result.WareHouseNo != "W02")//W02：零箱库
            {
                throw Oops.Bah("该托盘未在零箱库，请检查!");
            }
            //if (result.WareHouseNo != "W02")//W02：零箱库
            //{
            //    throw Oops.Bah("该托盘未在零箱库，请检查!");
            //}

            #endregion

@@ -1236,7 +1236,7 @@
            {
                throw Oops.Bah("未获取到对应储位信息，请检查!");
            }
            if (locat.Status != "1")
            if (locat.Status != "3")
            {
                throw Oops.Bah("当前储位不是有物品，请检查!");
            }