增加对申请入库时对平库库位的校验

zhaowc

2024-09-18 bdd84cc48ba7b2527584c44d174da8e7d20c5375

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -33,7 +33,7 @@

        #region 接口方法

        //JC23绑定物料托盘即增加库存
        //JC26绑定物料托盘即增加库存
        public void BindPalletStock(BoxPalletBindVm model, int userId)
        {
            try
@@ -72,10 +72,10 @@
                    {
                        throw new Exception("单据号不可为空!");
                    }
                    if (model.AsnDetailNo == 0)
                    {
                        throw new Exception("单据明细不可为空!");
                    }
                    //if (model.AsnDetailNo == 0)
                    //{
                    //    throw new Exception("单据明细不可为空!");
                    //}
                    //根据单据号获取入库单总单
                    notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo && a.OrderCode == model.OrderCode);
                    if (notice.Status != "0" && notice.Status != "1" && notice.Status != "2")
@@ -91,11 +91,13 @@
                        throw new Exception("批次不能为空!");
                    }
                    // 验证入库单明细是否存在
                    detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailNo && m.ASNNo == model.AsnNo && m.LotNo == model.LotNo && m.SkuNo == model.SkuNo);
                    detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" 
                    && m.ASNNo == model.AsnNo && m.LotNo == model.LotNo && m.SkuNo == model.SkuNo);
                    if (detail == null)
                    {
                        throw new Exception("当前物料及批次与单据无关联，请核实!");
                    }
                    model.AsnDetailNo = detail.Id;
                }


@@ -267,7 +269,7 @@
                        InspectQty = 0,
                        ASNNo = bind.ASNNo,
                        ASNDetailNo = bind.ASNDetailNo,
                        WareHouseNo = "",//所属仓库
                        WareHouseNo = "W01",//所属仓库
                        RoadwayNo = "",//所属巷道
                        AreaNo = "",//所属区域
                        LocatNo = "",//储位地址
@@ -446,8 +448,8 @@
                                Standard = box.Standard,
                                PackageStandard = box.PackageStandard,
                                StoreTime = box.StoreTime,
                                QtyCount = (int)box.QtyCount,
                                QtyOrd = (int)box.QtyOrd,
                                QtyCount = box.QtyCount,
                                QtyOrd = box.QtyOrd,
                                CreateUser = userId,
                                CreateTime = comTime,
                            };
@@ -637,7 +639,7 @@
                    .LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
                    .LeftJoin<SysUserInfor>((a, b, c, d) => a.UpdateUser == d.Id)
                    .LeftJoin<SysStorageLocat>((a, b, c, d, e) => a.LocatNo == e.LocatNo)
                    .LeftJoin<SysWareHouse>((a, b, c, d, e,f) => e.WareHouseNo == f.WareHouseNo)
                    .LeftJoin<SysWareHouse>((a, b, c, d, e,f) => a.WareHouseNo == f.WareHouseNo)
                    //.LeftJoin<BllBoxInfo>((a, b, c, d, e, f) => a.Id == e.BindNo)
                    .Select((a, b, c, d,e,f) => new PalletBindDto()
                    {
@@ -685,6 +687,7 @@
                throw new Exception(ex.Message);
            }
        }


        public List<BoxInfoDto> GetBoxInfoList(BoxInfoVm model, out int count)
        {
@@ -1375,7 +1378,7 @@
                   .AndIF(!string.IsNullOrWhiteSpace(layer), m => m.Layer == int.Parse(layer))
                   .AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo.Contains(locateNo))
                   .And(m => m.IsDel == "0" && m.Status == "0" && m.Flag == "0" && m.WareHouseNo == houseNo)
                   .And(m => m.AreaNo == categoryAreaNo)
                   .And(m => categoryAreaNo.Contains(m.AreaNo))
                   .ToExpression();//注意 这一句 不能少
                var total = 0;
                var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a => a.Depth).OrderBy(a => a.Column)
@@ -1560,7 +1563,9 @@
                    throw new Exception("请选择所属仓库");
                }
                //验证是否为平库入库
                if (houseNo == "W02")
                var houseType = Db.Queryable<SysWareHouse>().First(a => a.WareHouseNo == houseNo);//获取仓库类型
                //验证是否为平库入库
                if (houseType.Type == "2")
                {
                    throw new Exception("平库请使用PDA手持进行平库入库");
                }
@@ -1949,6 +1954,8 @@
                                Db.Updateable(bindModel).ExecuteCommand();
                                asnNo = stockModel.ASNNo;
                            }


                        }
                    }
                    foreach (DataStockDetail stockModel in stockDetail)