合并临时数据

yuyou_x

2024-03-15 a533b43a8d57b1973f505089aff75da669103d34

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -120,7 +120,7 @@
                  .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)
                  .AndIF((model.BindNo != 0 && !string.IsNullOrWhiteSpace(model.BindNo.ToString())), it => it.BindNo == model.BindNo)
                  .And(m => m.IsDel == "0")
                  .ToExpression();

@@ -591,7 +591,7 @@
                   .And(m => m.AreaNo.Contains(categoryAreaNo))
                   .ToExpression();//注意 这一句 不能少
                var total = 0;
                var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a=>a.Depth).OrderBy(a=>a.Column)
                var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a => a.Depth).OrderBy(a => a.Column)
                    .Select(a => new LocatDto()
                    {
                        Id = a.Id,
@@ -640,7 +640,7 @@
                    throw new Exception("该储位状态不是空储位或标志不是正常的");
                }

                


                //判断当前托盘是否存在绑定信息
                if (!string.IsNullOrWhiteSpace(bind.LocatNo))
@@ -1632,7 +1632,7 @@
                            }

                            //获取该批次最终质检结果
                            var quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == noticeDetail.ASNNo && a.LotNo == noticeDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
                            var quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.LotNo == noticeDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
                            #region 库存明细
                            var sd = new DataStockDetail()
                            {
@@ -1679,8 +1679,8 @@
                                sd.OwnerName = notice.CustomerName;//货主名称
                            }
                            else if (notice.Type == "1" || notice.Type == "5")//1:采购入库,2:其它入库
                            { 
                                sd.SupplierNo= notice.CustomerNo;//供应商编码
                            {
                                sd.SupplierNo = notice.CustomerNo;//供应商编码
                                sd.SupplierName = notice.CustomerName;//供应商名称
                            }