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

Mall.WebApi/Controllers/Property/WarehouseOutController.cs

@@ -166,12 +166,16 @@ namespace Mall.WebApi.Controllers.Property
                     var materialModel = oldmaterialList.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 + "不存在物料请先同步");
                     }
 
-                    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 + "库存不足");
                     }