Merge branch 'djp'

test

7 小时以前 ae03ec7001b6ba415fa5ccac7c6ff06c81578eb1

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -1633,9 +1633,9 @@
                }
                //开启事务
                Db.BeginTran();
                

                //库存箱支明细信息
                var boxList = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo).ToList();
                var boxList = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo && w.Status == "2").ToList();
                if (boxList.Count != 1)
                {
                    throw new Exception("该箱码信息错误，存在多个此箱码信息");