|
|
|
@ -803,12 +803,18 @@ public class IoTransInoutService {
|
|
|
|
|
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
|
|
|
|
|
stockOrderDetailEntity.setProductId(erpOrderEntity.getGoodsid());
|
|
|
|
|
stockOrderDetailEntity.setRelId(erpOrderEntity.getGoodsid());
|
|
|
|
|
|
|
|
|
|
CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(erpOrderEntity.getGoodsid(), erpOrderEntity.getSupId());
|
|
|
|
|
UdiRelevanceResponse udiRelevanceEntity = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getRelId());
|
|
|
|
|
stockOrderDetailEntity.setProductName(erpOrderEntity.getGoodsname());
|
|
|
|
|
stockOrderDetailEntity.setYlqxzcrbarmc(udiRelevanceEntity.getYlqxzcrbarmc());
|
|
|
|
|
if (erpOrderEntity.getPrice() == null) {
|
|
|
|
|
if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) {
|
|
|
|
|
stockOrderDetailEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice()));
|
|
|
|
|
if (StrUtil.isNotEmpty(companyProductRelevanceEntity.getPrice())) {
|
|
|
|
|
try {
|
|
|
|
|
stockOrderDetailEntity.setPrice(new BigDecimal(companyProductRelevanceEntity.getPrice()));
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
logger.error("设置价格异常");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
stockOrderDetailEntity.setManufactory(udiRelevanceEntity.getManufactory());
|
|
|
|
|