bklLiudl
2024-08-27 13b91828a0301ba53585662f5207ed45ff485638
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -227,7 +227,9 @@
                BllQualityInspect quality = new BllQualityInspect();
                if (model.Type == "0")
                {
                    quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
                    quality = Db.Queryable<BllQualityInspect>()
                        .Where(a => a.IsDel == "0" && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo)
                        .OrderByDescending(a => a.CreateTime).First();
                }
                DataStockDetail sd1 = null;
@@ -593,7 +595,7 @@
        #endregion
        #region 托盘绑定
        #region 组托收货
        public List<PalletBindDto> GetPalletBindList(PalletBindVm model, out int count)
        {
            try
@@ -602,8 +604,17 @@
                if (!string.IsNullOrWhiteSpace(model.SkuNo) || !string.IsNullOrWhiteSpace(model.SkuName))
                {
                    var detailList = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && m.SkuNo.Contains(model.SkuNo.Trim()) && m.SkuName.Contains(model.SkuName.Trim())).Select(m => m.Id).Distinct().ToList();
                    var detailList = Db.Queryable<BllArrivalNoticeDetail>()
                        .Where(m => m.IsDel == "0" && m.SkuNo.Contains(model.SkuNo.Trim()) && m.SkuName.Contains(model.SkuName.Trim()))
                        .Select(m => m.Id).Distinct().ToList();
                    strList = detailList;
                    if (strList.Count <= 0)
                    {
                        // 物料编码、名称检索失败直接返回null
                        count = 0;
                        return null;
                    }
                }
                Expression<Func<BllPalletBind, bool>> item = Expressionable.Create<BllPalletBind>()
                  .AndIF(!string.IsNullOrWhiteSpace(model.ASNNo), it => it.ASNNo.Contains(model.ASNNo.Trim()))
@@ -615,7 +626,7 @@
                  .AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => it.LotNo.Contains(model.LotNo.Trim()))
                  .AndIF(!string.IsNullOrWhiteSpace(model.LotText), it => it.LotText.Contains(model.LotText.Trim()))
                  .AndIF(!string.IsNullOrWhiteSpace(model.StartTime), it => it.CreateTime >= Convert.ToDateTime(model.StartTime))
                  .AndIF(!string.IsNullOrWhiteSpace(model.EndTime), it => it.CreateTime <= Convert.ToDateTime(model.EndTime))
                  .AndIF(!string.IsNullOrWhiteSpace(model.EndTime), it => it.CreateTime <= Convert.ToDateTime(model.EndTime).AddDays(1))
                  .AndIF(!string.IsNullOrWhiteSpace(model.Status), it => it.Status == model.Status)
                  .And(m => m.IsDel == "0")
                  .ToExpression();//注意 这一句 不能少