JC34WMS.git - Gitblit

			@@ -38,6 +38,7 @@
			}



			/// <summary>
			/// 获取库存物料类型分布
			/// </summary>
			@@ -303,14 +304,15 @@

			// 默认统计（物料批次质检库存状态货主)
			default:
			data2 = await data.GroupBy(a => new { a.SkuNo, a.SkuName, a.Standard, a.LotNo, a.LotText, a.OwnerNo, a.OwnerName, a.InspectStatus })
			//data2 = await data.GroupBy(a => new { a.SkuNo, a.SkuName, a.Standard, a.LotNo, a.LotText, a.OwnerNo, a.OwnerName, a.InspectStatus })
			data2 = await data.GroupBy(a => new { a.SkuNo, a.SkuName, a.Standard, a.LotNo, a.OwnerNo, a.OwnerName, a.InspectStatus })
			.Select(a => new MateDataStockDto()
			{
			SkuNo = a.SkuNo, //物料编码
			SkuName = a.SkuName, //物料名称
			Standard = a.Standard, //规格
			LotNo = a.LotNo, //批次
			LotText = a.LotText, //批次描述
			//LotText = a.LotText, //批次描述
			OwnerNo = a.OwnerNo, //货主编码
			OwnerName = a.OwnerName, //货主名称
			Status = status, //库存状态
			@@ -432,7 +434,10 @@
			/// <returns></returns>
			public List<MateDataStockDto> GetInventoryWarning(string skuNo, string skuName, string lotNo, string type)
			{
			string str = "select mate.Id,mate.SkuNo,mate.SkuName,mate.Standard,mate.Type,stock.Qty,stock.LockQty,stock.FrozenQty,stock.Qty - stock.LockQty - Stock.FrozenQty ResidueQty,stock.LotNo from SysMaterials mate right join DataStock stock on mate.SkuNo = stock.SkuNo Where stock.IsDel = @isdel and stock.Qty - stock.LockQty - Stock.FrozenQty <= mate.LowInventory";
			string str = $@"select mate.Id,mate.SkuNo,mate.SkuName,mate.Standard,mate.Type,stock.Qty,stock.LockQty,stock.FrozenQty,stock.Qty-stock.LockQty-Stock.FrozenQty ResidueQty,stock.LotNo
			from SysMaterials mate
			right join DataStock stock on mate.SkuNo=stock.SkuNo
			Where stock.IsDel=@isdel and stock.Qty-stock.LockQty-Stock.FrozenQty<mate.LowInventory";
			//判断物料号是否为空
			if (!string.IsNullOrEmpty(skuNo))
			{