Commit 1cdeb106 authored by xyt's avatar xyt

Merge remote-tracking branch 'origin/v2' into v2

parents a6fed8d6 7da87fd4
...@@ -98,8 +98,8 @@ public class ContractPurchaseMaterielServiceImpl implements IContractPurchaseMat ...@@ -98,8 +98,8 @@ public class ContractPurchaseMaterielServiceImpl implements IContractPurchaseMat
} }
} }
} }
Map<Long, CommoditySkuStockResponse> commoditySkuStock = getCommoditySkuStock(user, goodsIds,pageVO.getShopId()); /*暂不显示0806 Map<Long, CommoditySkuStockResponse> commoditySkuStock = getCommoditySkuStock(user, goodsIds,pageVO.getShopId());
boolean stockFlag = CollectionUtil.isNotEmpty(commoditySkuStock); boolean stockFlag = CollectionUtil.isNotEmpty(commoditySkuStock);*/
List<PurchaseMaterielQueryVO> resultList = result.getContent().stream().map(o -> { List<PurchaseMaterielQueryVO> resultList = result.getContent().stream().map(o -> {
PurchaseMaterielQueryVO entity = new PurchaseMaterielQueryVO(); PurchaseMaterielQueryVO entity = new PurchaseMaterielQueryVO();
entity.setId(o.getId()); entity.setId(o.getId());
...@@ -126,7 +126,7 @@ public class ContractPurchaseMaterielServiceImpl implements IContractPurchaseMat ...@@ -126,7 +126,7 @@ public class ContractPurchaseMaterielServiceImpl implements IContractPurchaseMat
entity.setAssociatedBrand(o.getAssociatedBrand()); entity.setAssociatedBrand(o.getAssociatedBrand());
Double contractFreeCount = o.getContractFreeCount(); Double contractFreeCount = o.getContractFreeCount();
entity.setContractFreeCount((contractFreeCount==null||contractFreeCount<0)?0D:contractFreeCount); entity.setContractFreeCount((contractFreeCount==null||contractFreeCount<0)?0D:contractFreeCount);
if(stockFlag){ /* 暂不显示0806 if(stockFlag){
CommoditySkuStockResponse stockResponse = commoditySkuStock.get(o.getAssociatedDataId()); CommoditySkuStockResponse stockResponse = commoditySkuStock.get(o.getAssociatedDataId());
if(stockResponse!=null) { if(stockResponse!=null) {
//供方库存 //供方库存
...@@ -134,7 +134,7 @@ public class ContractPurchaseMaterielServiceImpl implements IContractPurchaseMat ...@@ -134,7 +134,7 @@ public class ContractPurchaseMaterielServiceImpl implements IContractPurchaseMat
}else{ }else{
entity.setSupplierInventory(0D); entity.setSupplierInventory(0D);
} }
} }*/
return entity; return entity;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
...@@ -205,6 +205,7 @@ public class ContractPurchaseMaterielServiceImpl implements IContractPurchaseMat ...@@ -205,6 +205,7 @@ public class ContractPurchaseMaterielServiceImpl implements IContractPurchaseMat
entity.setPurchaseCount(o.getPurchaseCount()); entity.setPurchaseCount(o.getPurchaseCount());
entity.setBidAmount(o.getBidAmount()); entity.setBidAmount(o.getBidAmount());
entity.setBidCount(o.getBidCount()); entity.setBidCount(o.getBidCount());
entity.setContractFreeCount(o.getBidCount());
entity.setAssociatedDataId(o.getAssociatedDataId()); entity.setAssociatedDataId(o.getAssociatedDataId());
entity.setAssociatedGoods(o.getAssociatedGoods()); entity.setAssociatedGoods(o.getAssociatedGoods());
entity.setAssociatedMaterielNo(o.getAssociatedMaterielNo()); entity.setAssociatedMaterielNo(o.getAssociatedMaterielNo());
......
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