Merge branch 'csc'

Demo

2024-03-11 59a91fadefd16806964ab9f6e2ca0fb90c23854c

 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)
                {
@@ -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();
                            }
                        }
                    }


                    //获取对应回库规则