修改问题

wxw

1 天以前 d20f51230dd329ccf847f01d9aa8092faeaa075e

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -2728,10 +2728,8 @@
                else
                {
                    stockDetail.Status = "0";
                }
                //判断托盘上还有没有其他物料
                var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
                if (stockDetail.Qty <= 0 && palletData == null)
                }                
                if (stockDetail.Qty <= 0)
                {
                    await Db.Deleteable(stockDetail).ExecuteCommandAsync();
                }
@@ -2760,7 +2758,9 @@
                }

                //判断托盘上物料是否拣货完毕
                if (isDel == 0)
                //判断托盘上还有没有其他物料
                var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && w.Id != stockDetail.Id);
                if (isDel == 0 && palletData == null)
                {
                    pallet.Status = "0";
                    await Db.Updateable(pallet).ExecuteCommandAsync();
@@ -2822,8 +2822,8 @@
                //获取当前时间
                DateTime serverTime = Db.GetDate();
                //获取库存明细是否小于等于该垛数
                 
                var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && !string.IsNullOrWhiteSpace(s.WareHouseNo)).ToListAsync();

                var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && s.WareHouseNo == "W02").ToListAsync();
                if (stockDetail.Count > 0)
                {
                    //判断是否大于需要垛数
@@ -2832,7 +2832,7 @@
                        throw Oops.Bah("需要垛数大于库存垛数，请重新输入!");
                    }
                }
                stockDetail = new AllotSku().GetDataListOrder(stockDetail);
                //stockDetail = new AllotSku().GetDataListOrder(stockDetail);
                //获取库存总表信息
                var stock = await Db.Queryable<DataStock>().FirstAsync(s => s.IsDel == "0" && s.SkuNo == "100099");
                //验证库存总表是否为空
@@ -2840,16 +2840,26 @@
                {
                    throw Oops.Bah("库存信息不存在，请核查!");
                }

                //目标储位信息
                var endLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.OutMode);
                if (endLocat == null)
                {
                    throw Oops.Bah("库存信息不存在，请核查!");
                }
                //if (endLocat.Status != "0")
                //{
                //    throw Oops.Bah("目标储位不是空储位，请核查!");
                //}
                int i = 0;

                //开启事务
                Db.BeginTran();

                //遍历库存信息 
                foreach (var s in stockDetail)
                {
                    //获取储位信息
                    var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && (l.WareHouseNo == "W01"||l.WareHouseNo == "W02"));
                    var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W02");

                    if (locat == null)
                    {
@@ -2863,7 +2873,7 @@
                    locat.Status = "3"; //3 出库中
                    locat.UpdateTime = serverTime; //修改时间
                    locat.UpdateUser = userId; //修改人
                                               //修改储位信息
                    //修改储位信息
                    await Db.Updateable(locat).ExecuteCommandAsync();

                    //增加库存锁定数量
@@ -2908,7 +2918,7 @@
                        Status = "1",
                        LogisticsId = 0,
                        IsAdvance = "0",
                        OutMode = model.OutMode,//出库口
                        OutMode = model.OutMode,//出库目标储位

                        CreateUser = userId,
                        CreateTime = DateTime.Now
@@ -2959,7 +2969,7 @@
                        EndRoadway = endroad,

                        Order = 999,
                        Type = locat.WareHouseNo == "W01"?PLCTypeEnum.ShuttleCar : PLCTypeEnum.AGV
                        Type = PLCTypeEnum.AGV,//locat.WareHouseNo == "W01"?PLCTypeEnum.ShuttleCar : PLCTypeEnum.AGV
                    });
                    await Db.Insertable(exTask).ExecuteCommandAsync();