1.批量请核费用问题修改

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/ExpenseApplicationServiceImpl.java

@@ -775,6 +775,8 @@ public class ExpenseApplicationServiceImpl extends ServiceImpl<ExpenseApplicatio
 					data.setDeptId(Long.parseLong(item.getBranchId()));
 					data.setDeptName(item.getBranchName());
 				}
+				data.setBillBranchId(item.getBillBranchId());
+				data.setBillBranchName(item.getBillBranchName());
 				data.setBookingAgentId(item.getBookingAgentId());
 				data.setBookingAgentCnName(item.getBookingAgentCnName());
 				data.setBookingAgentEnName(item.getBookingAgentEnName());

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -261,12 +261,12 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				FeeCenter feeCenter = new FeeCenter();
 				feeCenter.setBranchId(branchId);
 				feeCenter.setBranchName(deptName);
+				feeCenter.setBillBranchId(bills.getBranchId());
+				feeCenter.setBillBranchName(bills.getBranchName());
 				feeCenter.setBookingAgentId(bills.getBookingAgentId());
 				feeCenter.setBookingAgentCnName(bills.getBookingAgentCnName());
 				feeCenter.setBookingAgentEnName(bills.getBookingAgentEnName());
 				feeCenter.setQuantityCntrDescr(bills.getQuantityCntrDescr());
-				feeCenter.setBillBranchId(bills.getBranchId());
-				feeCenter.setBillBranchName(bills.getBranchName());
 				feeCenter.setTeu(bills.getTeu());
 				feeCenter.setPid(bills.getId());
 				feeCenter.setCntrNo(bills.getQuantityCntrTypesDescr());
@@ -1243,6 +1243,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					feeCenter.setUpdateTime(new Date());
 					feeCenter.setUpdateUserName(AuthUtil.getUserName());
 				}
+				feeCenter.setBillBranchId(branchId);
+				feeCenter.setBillBranchName(deptName);
 				feeCenter.setStlTtlAmount(ObjectUtils.isNotNull(feeCenter.getStlTtlAmount()) ? feeCenter.getStlTtlAmount() : new BigDecimal("0"));
 				feeCenter.setUnsettledAmount(feeCenter.getAmount().subtract(feeCenter.getStlTtlAmount()));
 				int version = StringUtil.isBlank(feeCenter.getVersion()) ? 1 : Integer.parseInt(feeCenter.getVersion());
@@ -1381,12 +1383,12 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				FeeCenter feeCenter = new FeeCenter();
 				feeCenter.setBranchId(branchId);
 				feeCenter.setBranchName(deptName);
+				feeCenter.setBillBranchId(bills.getBranchId());
+				feeCenter.setBillBranchName(bills.getBranchName());
 				feeCenter.setBookingAgentId(bills.getBookingAgentId());
 				feeCenter.setBookingAgentCnName(bills.getBookingAgentCnName());
 				feeCenter.setBookingAgentEnName(bills.getBookingAgentEnName());
 				feeCenter.setQuantityCntrDescr(bills.getQuantityCntrDescr());
-				feeCenter.setBillBranchId(bills.getBranchId());
-				feeCenter.setBillBranchName(bills.getBranchName());
 				feeCenter.setTeu(bills.getTeu());
 				feeCenter.setPid(bills.getId());
 				feeCenter.setCntrNo(bills.getQuantityCntrTypesDescr());
@@ -2333,6 +2335,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					feeCenter.setUnitNo(item.getCntrTypeCode());
 					feeCenter.setBranchId(branchId);
 					feeCenter.setBranchName(deptName);
+					feeCenter.setBillBranchId(bills.getBranchId());
+					feeCenter.setBillBranchName(bills.getBranchName());
 					list.add(feeCenter);
 					list1.add(feeCenter);
 					count++;
@@ -2344,6 +2348,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						feeCenterD.setUnitNo(item.getCntrTypeCode());
 						feeCenterD.setBranchId(branchId);
 						feeCenterD.setBranchName(deptName);
+						feeCenterD.setBillBranchId(bills.getBranchId());
+						feeCenterD.setBillBranchName(bills.getBranchName());
 						list.add(feeCenterD);
 						list1.add(feeCenterD);
 						count++;
@@ -2355,6 +2361,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						feeCenterD.setUnitNo(item.getCntrTypeCode());
 						feeCenterD.setBranchId(branchId);
 						feeCenterD.setBranchName(deptName);
+						feeCenterD.setBillBranchId(bills.getBranchId());
+						feeCenterD.setBillBranchName(bills.getBranchName());
 						list.add(feeCenterD);
 						list1.add(feeCenterD);
 						count++;
@@ -2456,11 +2464,11 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 		feeCenter.setCreateTime(new Date());
 		feeCenter.setBranchId(bills.getBranchId());
 		feeCenter.setBranchName(bills.getBranchName());
+		feeCenter.setBillBranchId(bills.getBranchId());
+		feeCenter.setBillBranchName(bills.getBranchName());
 		feeCenter.setBookingAgentId(bills.getBookingAgentId());
 		feeCenter.setBookingAgentCnName(bills.getBookingAgentCnName());
 		feeCenter.setBookingAgentEnName(bills.getBookingAgentEnName());
-		feeCenter.setBillBranchId(bills.getBranchId());
-		feeCenter.setBillBranchName(bills.getBranchName());
 		feeCenter.setPid(bills.getId());
 		feeCenter.setCntrNo(bills.getQuantityCntrTypesDescr());
 		feeCenter.setBillNo(bills.getBillNo());