|
|
|
@ -900,9 +900,14 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
orderDetailCodeEntity.setAmount(new BigDecimal(orderDetailCodeEntity.getReCount()).multiply(orderDetailCodeEntity.getPrice()));
|
|
|
|
|
}
|
|
|
|
|
String msg = "";
|
|
|
|
|
BigDecimal invoiceAmount = BigDecimal.ZERO;
|
|
|
|
|
for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
|
|
|
|
|
if (StrUtil.trimToEmpty(orderInvoiceEntity.getBatchNo()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo()))
|
|
|
|
|
&& StrUtil.trimToEmpty(orderInvoiceEntity.getBindRlFk()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBindRlFk() + ""))) {
|
|
|
|
|
if (StrUtil.isNotEmpty(orderInvoiceEntity.getPrice())){
|
|
|
|
|
BigDecimal price = new BigDecimal(orderInvoiceEntity.getPrice());
|
|
|
|
|
invoiceAmount = invoiceAmount.add(price);
|
|
|
|
|
}
|
|
|
|
|
orderDetailCodeEntity.setRegStatus(true);
|
|
|
|
|
if (StrUtil.isNotEmpty(orderInvoiceEntity.getInvoiceEncode())) {
|
|
|
|
|
msg += "," + orderInvoiceEntity.getInvoiceEncode();
|
|
|
|
|