|
@@ -328,21 +328,12 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
|
|
|
result.setSupplyName(supplierInfo.getName());
|
|
|
}
|
|
|
//赋值采购明细
|
|
|
-// List<PurchaseDetail> purchaseDetailList = purchaseDetailService.list(q -> q.eq(PurchaseDetail::getPurchaseId, purchase.getId()));
|
|
|
-// List<PurchaseDetailVo> purchaseDetailVoList = BeanUtil.copyToList(purchaseDetailList, PurchaseDetailVo.class);
|
|
|
DynamicDataSourceContextHolder.push(SourceConstant.PURCHASE);
|
|
|
List<PurchaseDetailVo> purchaseDetailVoList = purchaseDetailMapper.getList(IWrapper.<PurchaseDetail>getWrapper()
|
|
|
.eq(PurchaseDetail::getPurchaseId, purchase.getId())
|
|
|
.orderByAsc("pi.name")
|
|
|
);
|
|
|
DynamicDataSourceContextHolder.poll();
|
|
|
-// //赋值产品信息
|
|
|
-// productInfoService.attributeAssign(purchaseDetailVoList, PurchaseDetailVo::getBussinessId, (item, productInfo) -> {
|
|
|
-// item.setProductCode(productInfo.getCode());
|
|
|
-// item.setProductName(productInfo.getName());
|
|
|
-// item.setProductCustomCode(productInfo.getCustomCode());
|
|
|
-// item.setProductSpec(productInfo.getSpec());
|
|
|
-// });
|
|
|
//赋值质检信息
|
|
|
List<QualityDetailVo> qualityInfoByPurchaseId = baseMapper.getQualityInfoByPurchaseId(purchase.getId());
|
|
|
//赋值质检人名称
|
|
@@ -546,10 +537,6 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
|
|
|
purchaseDetailVo.setReceiptList(stockJournalDetailsVos);
|
|
|
}
|
|
|
|
|
|
-// //名称升序
|
|
|
-// List<PurchaseDetailVo> collect = purchaseDetailVoList.stream().filter(item -> ObjectUtil.isNotEmpty(item.getProductName())).collect(Collectors.toList());
|
|
|
-// Collections.sort(collect, Comparator.comparing(PurchaseDetail::getProductName));
|
|
|
-
|
|
|
result.setPurchaseDetailVoList(purchaseDetailVoList);
|
|
|
return result;
|
|
|
}
|