|
|
@ -186,8 +186,8 @@ public class InvoiceServiceImpl implements InvoiceService { |
|
|
|
commonOrderInfo.setOrderItemInfo(CollectionUtils.isEmpty(cpyOrderItems)?nocpyOrderItems:nocpyOrderItems); |
|
|
|
commonOrderInfo.setOrderItemInfo(CollectionUtils.isEmpty(cpyOrderItems)?nocpyOrderItems:nocpyOrderItems); |
|
|
|
commonOrderInfoList.add(commonOrderInfo); |
|
|
|
commonOrderInfoList.add(commonOrderInfo); |
|
|
|
}else { |
|
|
|
}else { |
|
|
|
log.info("cpyOrderItems》》》》》》》》"+cpyOrderItems); |
|
|
|
log.info("cpyOrderItems》》》》》》》》"+JSON.toJSONString(cpyOrderItems)); |
|
|
|
log.info("nocpyOrderItems》》》》》》》》"+nocpyOrderItems); |
|
|
|
log.info("nocpyOrderItems》》》》》》》》"+JSON.toJSONString(nocpyOrderItems)); |
|
|
|
//成品油和非成品油混合
|
|
|
|
//成品油和非成品油混合
|
|
|
|
OrderInfo cpyOrderInfo = new OrderInfo(); |
|
|
|
OrderInfo cpyOrderInfo = new OrderInfo(); |
|
|
|
BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyOrderInfo); |
|
|
|
BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyOrderInfo); |
|
|
|