Skip to content

M
mall.oytour.com
Commit 6b08725e authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

parents 51bc223d 0f424d07
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
Mall.WebApi/Controllers/Property/WarehouseOutController.cs
View file @ 6b08725e
...@@ -166,12 +166,16 @@ namespace Mall.WebApi.Controllers.Property ...@@ -166,12 +166,16 @@ namespace Mall.WebApi.Controllers.Property
var materialModel = oldmaterialList.FirstOrDefault(); var materialModel = oldmaterialList.FirstOrDefault();
var orderGoodsDetail = orderGoodsList.Where(x => x.Id == item.OrderGoodsId).FirstOrDefault(); var orderGoodsDetail = orderGoodsList.Where(x => x.Id == item.OrderGoodsId).FirstOrDefault();
if (oldmaterialList == null || !oldmaterialList.Any() || materialModel== null ) if (oldmaterialList == null || !oldmaterialList.Any() || materialModel == null)
{ {
return ApiResult.Failed("订单号：" + orderGoodsDetail?.OrderNo + "的商品：" + orderGoodsDetail?.GoodsName + "不存在物料请先同步"); return ApiResult.Failed("订单号：" + orderGoodsDetail?.OrderNo + "的商品：" + orderGoodsDetail?.GoodsName + "不存在物料请先同步");
} }
if (oldmaterialList != null && (oldmaterialList.Sum(x => x.InventoryNum ?? 0)) <= 0) //if (oldmaterialList != null && (oldmaterialList.Sum(x => x.InventoryNum ?? 0)) <= 0)
//{
// return ApiResult.Failed("订单号：" + orderGoodsDetail?.OrderNo + "的商品：" + orderGoodsDetail?.GoodsName + "库存不足");
//}
if (oldmaterialList != null && (oldmaterialList.Sum(x => x.InventoryNum ?? 0)) < item.NewNumber)
{ {
return ApiResult.Failed("订单号：" + orderGoodsDetail?.OrderNo + "的商品：" + orderGoodsDetail?.GoodsName + "库存不足"); return ApiResult.Failed("订单号：" + orderGoodsDetail?.OrderNo + "的商品：" + orderGoodsDetail?.GoodsName + "库存不足");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment