修改问题

wxw

昨天 366377c9d97c379e05cf758e05c5bc55fe3b930e

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -1164,7 +1164,7 @@
                }
                //判断托盘是否在库外
                var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
                if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
                if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo) && stockDetail.WareHouseNo != "W04")
                {
                    throw new Exception("该托盘已有储位信息，请核实！");
                }
@@ -1348,6 +1348,13 @@
                        CreateUser = 0,
                        CreateTime = comTime
                    };
                    if (stockDetail != null)
                    {
                        sd1.WareHouseNo = stockDetail.WareHouseNo;
                        sd1.AreaNo = stockDetail.AreaNo;
                        sd1.RoadwayNo = stockDetail.RoadwayNo;
                        sd1.LocatNo = stockDetail.LocatNo;
                    }

                    //维护库存明细货主/供应商信息 //0:成品入库，2:中间品入库,4:车间余料入库,6:代储入库,7:寄存入库
                    if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")
@@ -4287,10 +4294,18 @@
            try
            {
                string strMsg = "";
                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == locatNo && w.Status == "0" && w.WareHouseNo == "W04");
                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == locatNo && w.WareHouseNo == "W04");
                if (storageLocat == null)
                {
                    throw new Exception("-1:地码(储位信息)不存在或非空闲状态，请核查!");
                    throw new Exception("-1:地码(储位信息)不存在，请核查!");
                }
                if (storageLocat.Status != "0")
                {
                    var detailInfo = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == storageLocat.LocatNo);
                    if (detailInfo != null)
                    {
                        throw new Exception("-1:地码(储位信息)非空闲，请核查!");
                    }
                }

                return strMsg;
@@ -6074,9 +6089,12 @@
                {
                    foreach (var item in stockDetail)
                    {
                        if (!string.IsNullOrEmpty(item.WareHouseNo))
                        if (!string.IsNullOrEmpty(item.WareHouseNo) && !string.IsNullOrEmpty(item.AreaNo))
                        {
                            throw new Exception("该托盘未在库外，请核查!");
                            if (item.AreaNo != "B06" && item.AreaNo != "B07" && item.AreaNo != "B09") 
                            {
                                throw new Exception("该托盘未在库外，请核查!");
                            }
                        }
                    }
                    iscount = 1; //回流入库
@@ -6084,10 +6102,18 @@
                #endregion

                #region 地码信息(储位信息)
                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0");
                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo);
                if (storageLocat == null)
                {
                    throw new Exception("储位信息不存在或非空闲状态，请核查!");
                    throw new Exception("储位信息不存，请核查!");
                }
                if (storageLocat.Status != "0")
                { 
                    var detailInfo=Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == storageLocat.LocatNo);
                    if (detailInfo != null)
                    {
                        throw new Exception("储位不是空闲状态，请核查!");
                    }
                }
                #endregion

@@ -6553,10 +6579,10 @@

                foreach (var item in stockDetailList)
                {
                    if (item.AreaNo != "B06" && item.AreaNo != "B07" && item.AreaNo != "B09")
                    {
                        throw new Exception("该托盘非线边回库托盘!");
                    }
                    //if (item.AreaNo != "B06" && item.AreaNo != "B07" && item.AreaNo != "B09")
                    //{
                    //    throw new Exception("该托盘非线边回库托盘!");
                    //}
                    //库存总表
                    var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
                    if (stock == null)
@@ -6569,7 +6595,7 @@
                    {
                        foreach (var box in boxInfoList)
                        {
                            var bllBox = Db.Queryable<BllBoxInfo>().First(w => w.IsDel == "0" && w.Status != "0");
                            var bllBox = Db.Queryable<BllBoxInfo>().First(w => w.IsDel == "0" && w.Status != "0" && w.BoxNo == box.BoxNo);
                            if (bllBox != null)
                            {
                                bllBox.Status = "0";