Commit d7becb78 authored by 吴春's avatar 吴春

提交代码

parent 024a47cb
...@@ -146,8 +146,8 @@ namespace Mall.WebApi.Controllers.Property ...@@ -146,8 +146,8 @@ namespace Mall.WebApi.Controllers.Property
//获取商品的出库规格物料信息 //获取商品的出库规格物料信息
var goodsIds = string.Join(",", demodel.WarehouseOutGoodsList.Select(x => x.NewGoodsId)); var goodsIds = string.Join(",", demodel.WarehouseOutGoodsList.Select(x => x.NewGoodsId));
var materialList = propertyModule.GetSuppliesMaterialList(new RB_Supplies_Material_Extend { GoodsIds = goodsIds, RB_Group_Id = requestParm.ERPGroupId, TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId }); // var materialList = propertyModule.GetSuppliesMaterialList(new RB_Supplies_Material_Extend { GoodsIds = goodsIds, RB_Group_Id = requestParm.ERPGroupId, TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId });
// var materialList = propertyModule.GetHaveInventory(new RB_Supplies_Material_Extend { GoodsIds = goodsIds, RB_Group_Id = requestParm.ERPGroupId, TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId }); var materialList = propertyModule.GetHaveInventory(new RB_Supplies_Material_Extend { GoodsIds = goodsIds, RB_Group_Id = requestParm.ERPGroupId, TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId });
foreach (var item in demodel.WarehouseOutGoodsList) foreach (var item in demodel.WarehouseOutGoodsList)
{ {
if (item.NewNumber <= 0) if (item.NewNumber <= 0)
...@@ -164,10 +164,10 @@ namespace Mall.WebApi.Controllers.Property ...@@ -164,10 +164,10 @@ namespace Mall.WebApi.Controllers.Property
{ {
return ApiResult.Failed("订单号:" + orderGoodsDetail?.OrderNo + "的商品:" + orderGoodsDetail?.GoodsName + "不存在物料请先同步"); return ApiResult.Failed("订单号:" + orderGoodsDetail?.OrderNo + "的商品:" + orderGoodsDetail?.GoodsName + "不存在物料请先同步");
} }
//if (!materialModel.InventoryNum.HasValue || (materialModel.InventoryNum ?? 0) <= 0) if (!materialModel.InventoryNum.HasValue || (materialModel.InventoryNum ?? 0) <= 0)
//{ {
// return ApiResult.Failed("订单号:" + orderGoodsDetail?.OrderNo + "的商品:" + orderGoodsDetail?.GoodsName + "库存不足"); return ApiResult.Failed("订单号:" + orderGoodsDetail?.OrderNo + "的商品:" + orderGoodsDetail?.GoodsName + "库存不足");
//} }
item.NewSpecificationSort = materialModel.SpecificationKey; item.NewSpecificationSort = materialModel.SpecificationKey;
item.NewSpecification = materialModel.SpecificationName; item.NewSpecification = materialModel.SpecificationName;
} }
......
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