呼叫小车

bklLiudl

2024-03-14 7e514494e595531a0517d6266823bc7f6d673831

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -114,8 +114,19 @@
        {
            try
            {
                Expression<Func<BllBoxInfo, bool>> item1 = Expressionable.Create<BllBoxInfo>()
                  .AndIF(!string.IsNullOrWhiteSpace(model.ASNNo), it => it.ASNNo.Contains(model.ASNNo.Trim()))
                  .AndIF(!string.IsNullOrWhiteSpace(model.PalletNo), it => it.PalletNo.Contains(model.PalletNo.Trim()))
                  .AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => it.LotNo.Contains(model.LotNo.Trim()))
                  .AndIF(!string.IsNullOrWhiteSpace(model.SkuNo), it => it.SkuNo.Contains(model.SkuNo.Trim()))
                  .AndIF(!string.IsNullOrWhiteSpace(model.SkuName), it => it.SkuName.Contains(model.SkuName.Trim()))
                  .AndIF((model.BindNo != 0 && !string.IsNullOrWhiteSpace(model.BindNo.ToString())),it=>it.BindNo == model.BindNo)
                  .And(m => m.IsDel == "0")
                  .ToExpression();

                var total = 0;
                var data = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BindNo == model.BindNo)
                DbHelper<BllBoxInfo> helper = new DbHelper<BllBoxInfo>(Db);
                var data = helper.GetAllWhereAsync(item1).Where(m => m.IsDel == "0")
                    .LeftJoin<BllPalletBind>((a, b) => a.BindNo == b.Id)
                    .GroupBy((a, b) => new
                    {
@@ -380,7 +391,8 @@
                Db.Updateable(boxInfos).ExecuteCommand();

                //修改托盘绑定信息
                bind.Qty -= qty;
                bind.Qty -= qty;                    // 数量变更
                bind.BitPalletMark = "1";           // 零托标记变更

                if (bind.Qty == 0)
                {
@@ -574,7 +586,7 @@
                   .And(m => m.AreaNo.Contains(categoryAreaNo))
                   .ToExpression();//注意 这一句 不能少
                var total = 0;
                var list = Db.Queryable<SysStorageLocat>().Where(item)
                var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a=>a.Depth).OrderBy(a=>a.Column)
                    .Select(a => new LocatDto()
                    {
                        Id = a.Id,
@@ -1218,17 +1230,23 @@
                        throw new Exception($"{palletNo}托盘条码不具有箱码信息，不可入库！");
                    }
                    skuNo = stockDetail.First().SkuNo;
                    //else
                    //{
                    //    //判断是否有零箱
                    //    var detailIdList = stockDetail.Select(m => m.Id).ToList();
                    //    var dataBoxInfo = Db.Queryable<DataBoxInfo>().Where(m => detailIdList.Contains(m.StockDetailId)).ToList();
                    //    if (dataBoxInfo.Count(m => m.BitBoxMark == "1")>0)
                    //    {
                    //        throw new Exception($"{palletNo}托盘上有零箱，不可入库！");
                    //    }
                    if (!string.IsNullOrWhiteSpace(stockDetail.First().WareHouseNo))
                    {
                        if (stockDetail.First().WareHouseNo == "W01")//立库
                        {
                            throw new Exception($"{palletNo}托盘上在立库中有库存储位信息，请核实！");
                        }

                    //}
                        if (stockDetail.First().WareHouseNo == "W02")//平库
                        {
                            var locatePingKu = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == stockDetail.First().LocatNo);
                            if (locatePingKu != null)
                            {
                                locatePingKu.Status = "0";
                                Db.Updateable(locatePingKu).ExecuteCommand();
                            }
                        }
                    }


                    //获取对应回库规则
@@ -1621,13 +1639,21 @@
                                IsBelt = item.IsBelt,
                                Demo = item.Demo,

                                OwnerNo = ownerNo,
                                OwnerName = ownerName,

                                IsDel = "0",
                                CreateUser = 0,
                                CreateTime = comTime
                            };
                            //维护库存明细货主/供应商信息
                            if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:成品入库，2:中间品入库,4:车间余料入库,6:代储入库,7:寄存入库
                            {
                                sd.OwnerNo = notice.CustomerNo;//货主编码
                                sd.OwnerName = notice.CustomerName;//货主名称
                            }
                            else if (notice.Type == "1" || notice.Type == "5")//1:采购入库,2:其它入库
                            { 
                                sd.SupplierNo= notice.CustomerNo;//供应商编码
                                sd.SupplierName = notice.CustomerName;//供应商名称
                            }

                            //if (quality.Count() > 0)
                            //{
@@ -1712,13 +1738,16 @@
                                    LockQty = 0,
                                    FrozenQty = 0,

                                    OwnerNo = ownerNo,
                                    OwnerName = ownerName,

                                    IsDel = "0",
                                    CreateUser = userId,
                                    CreateTime = comTime
                                };
                                //维护库存货主信息
                                if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:成品入库，2:中间品入库,4:车间余料入库,6:代储入库,7:寄存入库
                                {
                                    stock.OwnerNo = notice.CustomerNo;//货主编码
                                    stock.OwnerName = notice.CustomerName;//货主名称
                                }
                                Db.Insertable(stock).ExecuteCommand();
                            }
                            #endregion