JC26WMS.git - Gitblit

			@@ -57,16 +57,20 @@
			{
			return Db.Queryable<SysMaterials>()
			.LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
			.LeftJoin<SysPackag>((a, b,c) => a.PackagNo == c.PackagNo)
			.LeftJoin<SysUnit> ((a,b,c,d)=>a.UnitNo == d.UnitNo)
			.LeftJoin<SysMaterialCategory>((a,b,c,d,e)=>a.CategoryNo == e.CategoryNo)
			.Where((a,b,c,d,e) => d.IsDel == "0" && e.IsDel =="0")
			.WhereIF(!string.IsNullOrEmpty(skuNo), a => a.SkuNo.Contains(skuNo))
			.WhereIF(!string.IsNullOrEmpty(skuName), a => a.SkuNo.Contains(skuName))
			.WhereIF(!string.IsNullOrEmpty(skuName), a => a.SkuName.Contains(skuName))
			.WhereIF(!string.IsNullOrEmpty(auditStatusNo), a => a.AuditStatusNo == auditStatusNo)
			.WhereIF(!string.IsNullOrEmpty(type), a => a.Type == type)
			.WhereIF(!string.IsNullOrEmpty(isControlled), a => a.IsControlled == isControlled)
			.WhereIF(!string.IsNullOrEmpty(isInspect), a => a.IsInspect == isInspect)
			.WhereIF(!string.IsNullOrEmpty(environment), a => a.Environment == environment)
			.WhereIF(!string.IsNullOrEmpty(categoryNo), a => a.CategoryNo == categoryNo)
			.Where(a => a.IsDel == "0")
			.Select<MaterialsDto>((a, b) => new MaterialsDto() { CreateUserName = b.RealName }, true)
			.Where(a => a.IsDel == "0" )
			.Select<MaterialsDto>((a, b, c,d,e) => new MaterialsDto() { CreateUserName = b.RealName,PackagName = c.PackagName }, true)
			.ToListAsync();
			}

			@@ -90,6 +94,16 @@
			return await Db.Queryable<SysMaterials>().CountAsync(s => s.SkuNo == SkuNo && s.IsDel == "0");
			}


			/// <summary>
			/// 根据编号查询物料信息
			/// </summary>
			/// <param name="PackagNo">包装编号</param>
			/// <returns></returns>
			public async Task<int> GetMateByPa(string PackagNo)
			{
			return await Db.Queryable<SysMaterials>().CountAsync(s => s.PackagNo == PackagNo && s.IsDel == "0");
			}
			/// <summary>
			/// 新增物料信息
			/// </summary>