化PDA下发出库功能，增加储位楼层分类；修改agv转运未校验目标储位状态问题

wxw

2 天以前 b34e22087879092e0577b54faf9ed24a1f8de2ae

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -143,10 +143,14 @@
                    var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
                    if (newPalletInfo == null)
                    {
                        var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew &&(m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
                        throw Oops.Bah("新托盘信息不存在！");
                    }
                    if (newPalletInfo.Status == "0")
                    {
                        var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && (m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
                        if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
                        {
                            throw Oops.Bah("新托盘信息不存在或已被使用！");
                            throw Oops.Bah("一个托盘只能接受一个出库单拼托！");
                        }
                    }
                    else
@@ -303,6 +307,19 @@
                    }
                    else
                    {
                        var locateStr = stockDetail.LocatNo;
                        //更改储位状态为空储位
                        var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == locateStr);
                        if (locate != null)
                        {
                            locate.Status = "0";
                            Db.Updateable(locate).ExecuteCommand();
                        }
                        stockDetail.WareHouseNo = "";
                        stockDetail.RoadwayNo = "";
                        stockDetail.AreaNo = "";
                        stockDetail.LocatNo = "";

                        stockDetail.SONo = soNo;
                        stockDetail.UDF5 = "1";
                        await Db.Updateable(stockDetail).ExecuteCommandAsync();
@@ -481,7 +498,7 @@
                        pinStockDetail.LockQty += pickQty;
                        await Db.Updateable(pinStockDetail).ExecuteCommandAsync();
                    }
                }
                }                

                //添加操作日志记录
                var k = new OperationSOServer().AddLogOperationSo("PDA模块", "拣货拼托", soNo, "拣货", $"在PDA上对出库单号为：{soNo}的原托盘码为：{palletNo}，新托盘码为：{palletNoNew}的拣货拼托操作", userId);
@@ -1519,7 +1536,7 @@
                string skuName = boxInfos.First().SkuName;

                // 验证是否车间线边仓库
                var areaList = new List<string>() { "B06", "B07", "B09" };
                var areaList = new List<string>() { "B06", "B07", "B09", "B24" };
                if (!areaList.Contains(stockDetail.AreaNo))
                {
                    throw Oops.Bah("托盘不是车间托盘！");
@@ -1565,7 +1582,7 @@
                    await Db.Updateable(stockDetail).ExecuteCommandAsync();
                }   
                stock.Qty -= pickQty;
                //stock.LockQty -= pickQty;
                stock.LockQty -= pickQty;
                if (stock.Qty <= 0)
                {
                    await Db.Deleteable(stock).ExecuteCommandAsync();
@@ -1677,7 +1694,7 @@
                }

                // 验证是否车间线边仓库
                var areaList = new List<string>() { "B06", "B07", "B09" };
                var areaList = new List<string>() { "B06", "B07", "B09", "B24" };
                if (!areaList.Contains(stockDetail.AreaNo))
                {
                    throw Oops.Bah("托盘不是车间托盘！");