clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-05-13 09:51:25 +08:00
parent 05ac0b5acb
commit 60c02a28ed
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -1190,15 +1190,19 @@ public class OrderMasterController extends BaseController {
param.setOrderDetailId(orderDetail.getId()); param.setOrderDetailId(orderDetail.getId());
List<OrderAttachmentRecord> orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param); List<OrderAttachmentRecord> orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param);
BigDecimal addMoneyTotal= BigDecimal.ZERO; BigDecimal addMoneyTotal= BigDecimal.ZERO;
String remark=null;
for (FinancialChangeRecord financialChangeRecord:financialChangeRecords){ for (FinancialChangeRecord financialChangeRecord:financialChangeRecords){
addMoneyTotal= addMoneyTotal.add(financialChangeRecord.getChangeMoney()); addMoneyTotal= addMoneyTotal.add(financialChangeRecord.getChangeMoney());
if (StringUtils.isNotEmpty(financialChangeRecord.getRemark())){
remark= financialChangeRecord.getRemark();
}
} }
for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){
addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney()); addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney());
} }
OrderStandardDetail orderStandardDetail = new OrderStandardDetail(); OrderStandardDetail orderStandardDetail = new OrderStandardDetail();
orderStandardDetail.setRemark(remark);
orderStandardDetail.setAddMoney(addMoneyTotal); orderStandardDetail.setAddMoney(addMoneyTotal);
orderStandardDetail.setOrderDetailId(orderDetail.getId()); orderStandardDetail.setOrderDetailId(orderDetail.getId());
orderStandardDetail.setOrderDetailCode(orderDetail.getCode()); orderStandardDetail.setOrderDetailCode(orderDetail.getCode());