修改问题

wxw

1 天以前 d20f51230dd329ccf847f01d9aa8092faeaa075e

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -1509,6 +1509,9 @@
                {
                    throw Oops.Bah("未查询到该托盘分配的库存明细信息！");
                }
                string lotNpstr = boxInfos.First().LotNo;
                string skuNo = boxInfos.First().SkuNo;
                string skuName = boxInfos.First().SkuName;

                // 验证是否车间线边仓库
                var areaList = new List<string>() { "B06", "B07", "B09" };
@@ -1579,10 +1582,179 @@
                    pallet.Status = "0";
                    await Db.Updateable(pallet).ExecuteCommandAsync();
                }
                 

                #region  插入车间出入库记录表
                //插入入库日志
                var _log = new LogWorkShop
                {
                    Type = "1",//类型，0：入库 1：出库
                    PalletNo = palletNo,
                    BoxNo = boxNo,
                    LotNo = lotNpstr,
                    SkuNo = skuNo,
                    SkuName = skuName,
                    Qty = pickQty
                };
                // 插入车间出库记录
                Db.Insertable(_log).ExecuteCommand();
                #endregion


                //添加操作日志记录
                var k = new OperationSOServer().AddLogOperationSo("PDA模块", "车间出库", 
                    boxNo, "拣货", $"在PDA上对箱号为：{boxNo}的托盘码为：{palletNo}的拣货操作", userId);
                    boxNo, "出库", $"在PDA上对箱号为：{boxNo}的托盘码为：{palletNo}的拣货操作", userId);
                Db.CommitTran();
            }
            catch (AppFriendlyException e)
            {
                Db.RollbackTran();
            }
            catch (Exception e)
            {
                Db.RollbackTran();
                throw new Exception(e.Message);
            }
        }

        // 车间Pda拣货-数量
        public async Task ChejianPickNum(PdaSoVm model, int userId) 
        {
            Db.BeginTran();
            try
            {
                #region 判断

                if (string.IsNullOrWhiteSpace(model.PalletNo))
                {
                    throw Oops.Bah("托盘码不能为空");
                }
                if (string.IsNullOrWhiteSpace(model.SkuNo))
                {
                    throw Oops.Bah("物料编码不能为空");
                }

                decimal skuNum = 0;
                if (string.IsNullOrEmpty(model.PickQty))
                {
                    throw Oops.Bah("物料数量不可为null");
                }
                else 
                {
                    skuNum = decimal.Parse(model.PickQty);
                    if (skuNum <= 0) 
                    {
                        throw Oops.Bah("物料数量应大于0！");
                    }
                }

                // 判断是否贴标物料
                var skuModel = await Db.Queryable<SysMaterials>().FirstAsync(m => m.IsDel == "0" && m.SkuNo == model.SkuNo);
                if (skuModel == null)
                {
                    throw Oops.Bah("物料不存在，请检查物料编码是否拯却！");
                }
                else 
                {
                    if (skuModel.IsPasteCode != "0") 
                    {
                        throw Oops.Bah("该物料为贴标物料，请到标签页面拣货！");
                    }
                }


                //库存明细
                var stockDetail = await Db.Queryable<DataStockDetail>()
                    .FirstAsync(m => m.IsDel == "0" && m.PalletNo == model.PalletNo
                    && m.SkuNo == model.SkuNo  && m.LotNo == model.LotNo);
                if (stockDetail == null)
                {
                    throw Oops.Bah("未查询到该托盘上货物的库存明细信息！");
                }

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

                //库存总表
                var stock = await Db.Queryable<DataStock>()
                    .FirstAsync(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
                if (stock == null)
                {
                    throw Oops.Bah("未查询到该托盘上货物的库存信息！");
                }
                #endregion

                var pickQty = skuNum;

                //删除或修改库存明细
                stockDetail.BitPalletMark = "1";//修改为零托标识
                stockDetail.Qty -= pickQty;
                if (stockDetail.Qty == stockDetail.LockQty)
                {
                    stockDetail.Status = "2";
                }
                else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
                {
                    stockDetail.Status = "1";
                }
                else
                {
                    stockDetail.Status = "0";
                }

                if (stockDetail.Qty <= 0)
                {
                    await Db.Deleteable(stockDetail).ExecuteCommandAsync();
                }
                else
                {
                    await Db.Updateable(stockDetail).ExecuteCommandAsync();
                }
                stock.Qty -= pickQty;
                if (stock.Qty <= 0)
                {
                    await Db.Deleteable(stock).ExecuteCommandAsync();
                }
                else
                {
                    await Db.Updateable(stock).ExecuteCommandAsync();
                }

                var num2 = await Db.Queryable<DataStockDetail>().CountAsync(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
                if (num2 <= 0)
                {
                    //改变托盘状态
                    var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == model.PalletNo && m.IsDel == "0");
                    if (pallet == null)
                    {
                        throw Oops.Bah("未在托盘表中查询到托盘信息");
                    }
                    pallet.Status = "0";
                    await Db.Updateable(pallet).ExecuteCommandAsync();
                }

                #region  插入车间出入库记录表
                // 创建实体
                var _log = new LogWorkShop
                {
                    Type = "1",//类型，0：入库 1：出库
                    PalletNo = model.PalletNo,
                    BoxNo = "",
                    LotNo = model.LotNo,
                    SkuNo = skuModel.SkuNo,
                    SkuName = skuModel.SkuName,
                    Qty = pickQty
                };
                // 插入车间出库记录
                Db.Insertable(_log).ExecuteCommand();
                #endregion

                //添加操作日志记录
                var k = new OperationSOServer().AddLogOperationSo("PDA模块", "车间出库",
                    skuModel.SkuName, "拣货", $"在PDA车间出库页上对：：{skuModel.SkuName}的物料进行拣货操作", userId);
                Db.CommitTran();
            }
            catch (AppFriendlyException e)
@@ -2556,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();
                }
@@ -2588,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();
@@ -2650,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)
                {
                    //判断是否大于需要垛数
@@ -2660,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");
                //验证库存总表是否为空
@@ -2668,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)
                    {
@@ -2691,7 +2873,7 @@
                    locat.Status = "3"; //3 出库中
                    locat.UpdateTime = serverTime; //修改时间
                    locat.UpdateUser = userId; //修改人
                                               //修改储位信息
                    //修改储位信息
                    await Db.Updateable(locat).ExecuteCommandAsync();

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

                        CreateUser = userId,
                        CreateTime = DateTime.Now
@@ -2787,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();

@@ -5129,9 +5311,6 @@

            return data;
        }

       

        #endregion

    }