1.没有录费用明细，但是打印的时候显示了

2.分单添加主单，主单件重尺计算
3.决策分析，不显示所属公司
4.业务利润增加审核通过或未通过条件
5.海运出口增加来源预定舱单号
6.买箱，租箱等自由箱启用时放箱号箱数计算问题修改
7.自由箱启用-放箱号明细箱状态为空修改
8.超期箱使费 计算不对
9.增加预定舱复制接口

blade-service-api/blade-los-api/src/main/java/org/springblade/los/box/entity/Archives.java

@@ -379,6 +379,11 @@ public class Archives implements Serializable {
 	@TableField(exist = false)
 	private String billNO;
 
+	/**
+	 * 精确查询箱号
+	 */
+	@TableField(exist = false)
+	private String accurate;
 
 	/**
 	 * 起租日期(开始-结束)

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -1590,6 +1590,11 @@ public class Bills implements Serializable {
 	 */
 	@ApiModelProperty(value = "来源id预定舱")
 	private Long temporaryId;
+/**
+	 * 来源预定舱单号
+	 */
+	@ApiModelProperty(value = "来源预定舱单号")
+	private String temporaryNo;
 
 	/**
 	 * 到港日期

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -47,7 +47,6 @@ import org.springblade.los.business.sea.dto.ContainersReports;
 import org.springblade.los.business.sea.entity.*;
 import org.springblade.los.business.sea.service.*;
 import org.springblade.los.business.sea.vo.GenerateMailVo;
-import org.springblade.los.enums.AmendType;
 import org.springblade.los.finance.agreement.entity.AgreementPrice;
 import org.springblade.los.finance.agreement.entity.AgreementPriceItems;
 import org.springblade.los.finance.agreement.service.IAgreementPriceItemsService;
@@ -1538,11 +1537,11 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						.eq(Bills::getTenantId, AuthUtil.getTenantId())
 						.eq(Bills::getIsDeleted, 0));
 					if (!billsList.isEmpty()) {
-						String mblNo = billsList.stream().map(Bills::getMblno).filter(Objects::nonNull).collect(Collectors.joining(","));
+						List<Long> mblNo = billsList.stream().map(Bills::getId).filter(Objects::nonNull).collect(Collectors.toList());
 						if (ObjectUtils.isNotNull(mblNo)) {
 							// 所有分单的费用
 							LambdaQueryWrapper<FeeCenter> feeCenterLambdaQueryWrapper = new LambdaQueryWrapper<FeeCenter>()
-								.apply("find_in_set(mblno,'" + mblNo + "')")
+								.in(FeeCenter::getPid, mblNo)
 								.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 								.eq(FeeCenter::getIsDeleted, 0);
 							if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
@@ -1558,17 +1557,17 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							if (feeCenterListMh.isEmpty()) {
 								throw new RuntimeException("请先维护费用信息");
 							}
-							List<Long> amendIds = feeCenterListMh.stream().filter(f -> AmendType.isAmendType(f.getBusinessType())).map(FeeCenter::getPid).distinct().collect(Collectors.toList());
+//							List<Long> amendIds = feeCenterListMh.stream().filter(f -> AmendType.isAmendType(f.getBusinessType())).map(FeeCenter::getPid).distinct().collect(Collectors.toList());
 							allFeeCenter.addAll(feeCenterListMh);
-							if (!CollectionUtils.isEmpty(amendIds)) {
-								List<Amends> amendsList = amendsService.list(new LambdaQueryWrapper<Amends>()
-									.select(Amends::getId, Amends::getStatus).in(Amends::getId, amendIds));
-								feeCenterListMh = feeCenterListMh.stream().filter(fc -> {
-									// 是 amend 类型并没审核通过的不计入
-									Amends amends = amendsList.stream().filter(a -> a.getId().equals(fc.getPid())).findFirst().orElse(null);
-									return amends == null || CommonEnum.THREE.info.equals(String.valueOf(amends.getStatus()));
-								}).collect(Collectors.toList());
-							}
+//							if (!CollectionUtils.isEmpty(amendIds)) {
+							List<Amends> amendsList = amendsService.list(new LambdaQueryWrapper<Amends>()
+								.select(Amends::getId, Amends::getStatus).in(Amends::getOrigId, mblNo));
+							feeCenterListMh = feeCenterListMh.stream().filter(fc -> {
+								// 是 amend 类型并没审核通过的不计入
+								Amends amends = amendsList.stream().filter(a -> a.getId().equals(fc.getPid())).findFirst().orElse(null);
+								return amends == null || CommonEnum.THREE.info.equals(String.valueOf(amends.getStatus()));
+							}).collect(Collectors.toList());
+//							}
 
 							for (FeeCenter item : feeCenterListMh) {
 								if (ObjectUtils.isNotNull(item.getShortName())) {
@@ -1654,7 +1653,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					// 当前单据的费用信息
 					LambdaQueryWrapper<FeeCenter> feeCenterLambdaQueryWrapper = new LambdaQueryWrapper<FeeCenter>()
-						.eq(FeeCenter::getMblno, bills.getMblno())
+						.eq(FeeCenter::getPid, bills.getId())
 						.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 						.eq(FeeCenter::getIsDeleted, 0);
 					if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
@@ -1667,17 +1666,14 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 					}
 					List<FeeCenter> feeCenterList = feeCenterService.list(feeCenterLambdaQueryWrapper);
-					List<Long> amendIds = feeCenterList.stream().filter(f -> AmendType.isAmendType(f.getBusinessType())).map(FeeCenter::getPid).distinct().collect(Collectors.toList());
 					allFeeCenter.addAll(feeCenterList);
-					if (!CollectionUtils.isEmpty(amendIds)) {
-						List<Amends> amendsList = amendsService.list(new LambdaQueryWrapper<Amends>()
-							.select(Amends::getId, Amends::getStatus).in(Amends::getId, amendIds));
-						feeCenterList = feeCenterList.stream().filter(fc -> {
-							// 是 amend 类型并没审核通过的不计入
-							Amends amends = amendsList.stream().filter(a -> a.getId().equals(fc.getPid())).findFirst().orElse(null);
-							return amends == null || CommonEnum.THREE.info.equals(String.valueOf(amends.getStatus()));
-						}).collect(Collectors.toList());
-					}
+					List<Amends> amendsList = amendsService.list(new LambdaQueryWrapper<Amends>()
+						.select(Amends::getId, Amends::getStatus).in(Amends::getOrigId, bills.getId()));
+					feeCenterList = feeCenterList.stream().filter(fc -> {
+						// 是 amend 类型并没审核通过的不计入
+						Amends amends = amendsList.stream().filter(a -> a.getId().equals(fc.getPid())).findFirst().orElse(null);
+						return amends == null || CommonEnum.THREE.info.equals(String.valueOf(amends.getStatus()));
+					}).collect(Collectors.toList());
 
 					List<FeeCenter> feeD = feeCenterList.stream().filter(e -> MagicValues.D.equals(e.getDc())).collect(Collectors.toList());
 					bills.setFeeCenterListD(feeD);
@@ -1773,7 +1769,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						.eq(Bills::getIsDeleted, 0));
 					if (details != null) {
 						LambdaQueryWrapper<FeeCenter> feeCenterLambdaQueryWrapper = new LambdaQueryWrapper<FeeCenter>()
-							.eq(FeeCenter::getMblno, bills.getMblno())
+							.eq(FeeCenter::getPid, bills.getId())
 							.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 							.eq(FeeCenter::getIsDeleted, 0);
 						if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
@@ -1872,7 +1868,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 						list.add(bills);
 						LambdaQueryWrapper<FeeCenter> lambdaQueryWrapper = new LambdaQueryWrapper<FeeCenter>()
-							.eq(FeeCenter::getMblno, details.getMblno())
+							.eq(FeeCenter::getPid, details.getId())
 							.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 							.eq(FeeCenter::getIsDeleted, 0);
 						if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
@@ -2053,7 +2049,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (!containersList.isEmpty()) {
 					List<Long> idList = containersList.stream().map(Containers::getPodStationId)
 						.filter(Objects::nonNull).collect(Collectors.toList());
-					if(!idList.isEmpty()){
+					if (!idList.isEmpty()) {
 						corpsList = bCorpsService.list(new LambdaQueryWrapper<BCorps>()
 							.eq(BCorps::getTenantId, AuthUtil.getTenantId())
 							.eq(BCorps::getIsDeleted, 0)
@@ -2063,9 +2059,9 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				for (Containers item : containersList) {
 					item.setVolume(item.getCntrTypeCode() + "*1");
 					if (!corpsList.isEmpty() && ObjectUtils.isNotNull(item.getPodStationId())) {
-                        corpsList.stream().filter(e -> e.getId().equals(item.getPodStationId())).findFirst()
+						corpsList.stream().filter(e -> e.getId().equals(item.getPodStationId())).findFirst()
 							.ifPresent(corps -> item.setPodStationDetail(corps.getDetails()));
-                    }
+					}
 				}
 				bills.setContainersList(containersList);
 				bills.setDept(dept);

blade-service/blade-los/src/main/java/org/springblade/los/box/controller/ArchivesController.java

@@ -104,6 +104,7 @@ public class ArchivesController extends BladeController {
 			.eq(Archives::getIsDeleted, 0)
 			.like(ObjectUtils.isNotNull(archives.getCode()), Archives::getCode, archives.getCode())//箱号
 			.like(ObjectUtils.isNotNull(archives.getContractNo()), Archives::getContractNo, archives.getContractNo())//合同号
+			.eq(ObjectUtils.isNotNull(archives.getAccurate()), Archives::getCode, archives.getAccurate())
 			.like(ObjectUtils.isNotNull(archives.getName()), Archives::getName, archives.getName())//箱型
 			.eq(ObjectUtils.isNotNull(archives.getTypeId()), Archives::getTypeId, archives.getTypeId())//箱型id
 			.eq(ObjectUtils.isNotNull(archives.getTypeName()), Archives::getTypeName, archives.getTypeName())//箱型id
@@ -274,6 +275,7 @@ public class ArchivesController extends BladeController {
 		LambdaQueryWrapper<Archives> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(Archives::getTenantId, AuthUtil.getTenantId())
 			.eq(Archives::getIsDeleted, 0)
+			.eq(ObjectUtils.isNotNull(archives.getAccurate()), Archives::getCode, archives.getAccurate())
 			.like(ObjectUtils.isNotNull(archives.getContractNo()), Archives::getContractNo, archives.getContractNo())
 			.like(ObjectUtils.isNotNull(archives.getName()), Archives::getName, archives.getName())
 			.eq(ObjectUtils.isNotNull(archives.getAddressId()), Archives::getAddressId, archives.getAddressId())

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

@@ -1796,6 +1796,9 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 		} else {
 			feeCenter.setExrate(currencyUtils.obtainExrate("C", curExrateList, feeCenter.getCurCode(), "1"));
 		}
+		if (new BigDecimal("0.00").compareTo(amount) == 0) {
+			return null;
+		}
 		feeCenter.setAmount(amount);
 		feeCenter.setAmountLoc(amount.multiply(feeCenter.getExrate()));
 		feeCenter.setPrice(amount);

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

@@ -1846,9 +1846,9 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				putBox.setUpdateTime(new Date());
 				putBox.setUpdateUserName(AuthUtil.getUserName());
 
-				putBox.setTotalNum(putBox.getTotalNum() + tradingBox.getBoxNumber());
+				putBox.setTotalNum(putBox.getTotalNum() + itemList.size());
 				putBox.setRemainingNum(putBox.getTotalNum() - putBox.getOccupyNum());
-				putBox.setStorageNum(putBox.getStorageNum() + tradingBox.getBoxNumber());
+				putBox.setStorageNum(putBox.getStorageNum() + itemList.size());
 
 				if (ObjectUtils.isNotNull(putBox.getPodId())) {
 					String podId = putBox.getPodId() + "," + detail.getPodId();
@@ -1979,6 +1979,8 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					boxItems.setBoxClass(item.getBoxCategory());
 					boxItems.setBoxStatus(item.getBoxStatus());
 					boxItems.setBoxCondition(item.getBoxCondition());
+					boxItems.setStatus("待使用");
+					boxItems.setBoxDynamics("空箱进场");
 				} else {
 					boxItems = new PutBoxItems();
 					boxItems.setPid(putBox.getId());
@@ -1993,6 +1995,8 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					boxItems.setBoxClass(item.getBoxCategory());
 					boxItems.setBoxStatus(item.getBoxStatus());
 					boxItems.setBoxCondition(item.getBoxCondition());
+					boxItems.setStatus("待使用");
+					boxItems.setBoxDynamics("空箱进场");
 				}
 				putBoxItemsList.add(boxItems);
 			}

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BookingCabinController.java

@@ -145,5 +145,15 @@ public class BookingCabinController extends BladeController {
 		return billsService.sendMessageBooking(bills);
 	}
 
+	/**
+	 * 复制单据
+	 */
+	@GetMapping("/copyBillsBooking")
+	@RepeatSubmit
+	public R copyBillsBooking( Bills bills) {
+		Bills declare = billsService.copyBillsBooking(bills);
+		return R.data(declare);
+	}
+
 }
 

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/IBillsService.java

@@ -187,4 +187,6 @@ public interface IBillsService extends IService<Bills> {
 	R sendMessageBooking(Bills bills);
 
 	R updateBillType(String ids, String billType);
+
+	Bills copyBillsBooking(Bills bills);
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -747,6 +747,24 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			}
 			seaContainerNumberItemService.saveOrUpdateBatch(bills.getContainerNumberItemList());
 		}
+		if (ObjectUtils.isNotNull(bills.getContainersList())) {
+			for (Containers item : bills.getContainersList()) {
+				item.setPid(bills.getId());
+				if (item.getId() == null) {
+					item.setCreateTime(new Date());
+					item.setCreateUser(AuthUtil.getUserId());
+					item.setCreateUserName(AuthUtil.getUserName());
+					if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
+						item.setCreateDeptName(deptName);
+					}
+				} else {
+					item.setUpdateUser(AuthUtil.getUserId());
+					item.setUpdateTime(new Date());
+					item.setUpdateUserName(AuthUtil.getUserName());
+				}
+			}
+			containersService.saveOrUpdateBatch(bills.getContainersList());
+		}
 		//应结日期计算
 		if ("SE".equals(bills.getBusinessType())) {
 			bills.setDueDate(this.dueDate(bills));
@@ -1270,9 +1288,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			BigDecimal amountDrLoc = bills.getAmountDrLoc();
 			BigDecimal amountCrLoc = bills.getAmountCrLoc();
 			BigDecimal amountProfitLoc = bills.getAmountProfitLoc();*/
-			BigDecimal grossWeight = bills.getGrossWeight();
-			BigDecimal quantity = bills.getQuantity();
-			BigDecimal measurement = bills.getMeasurement();
+			BigDecimal grossWeight = new BigDecimal("0.00");
+			BigDecimal quantity = new BigDecimal("0.00");
+			BigDecimal measurement = new BigDecimal("0.00");
 			Integer teuTotal = bills.getTeuTotal();
 			String marks = "";
 			String commodityDescr = "";
@@ -1304,6 +1322,15 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			bills.setAmountDrLoc(amountDrLoc);
 			bills.setAmountCrLoc(amountCrLoc);
 			bills.setAmountProfitLoc(amountProfitLoc);*/
+			List<Bills> billsListF = baseMapper.selectList(new LambdaQueryWrapper<Bills>()
+				.eq(Bills::getTenantId, AuthUtil.getTenantId())
+				.eq(Bills::getIsDeleted, 0)
+				.eq(Bills::getMasterId, id));
+			if (!billsListF.isEmpty()){
+				grossWeight = grossWeight.add(billsListF.stream().map(Bills::getGrossWeight).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				quantity = quantity.add(billsListF.stream().map(Bills::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				measurement = measurement.add(billsListF.stream().map(Bills::getMeasurement).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+			}
 			bills.setGrossWeight(grossWeight);
 			bills.setQuantity(quantity);
 			bills.setMeasurement(measurement);
@@ -4128,6 +4155,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		Bills copyBills = new Bills();
 		BeanUtil.copyProperties(detail, copyBills);
 		copyBills.setTemporaryId(detail.getId());
+		copyBills.setTemporaryNo(detail.getBillNo());
 		copyBills.setId(null);
 		BusinessBillNo businessBillNo = new BusinessBillNo();
 		businessBillNo.setBusinessTypeId(businessType.getId());
@@ -4551,6 +4579,94 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		return R.data("操作成功");
 	}
 
+	@Override
+	public Bills copyBillsBooking(Bills bills) {
+		if (bills.getId() == null) {
+			throw new SecurityException("缺少必要参数");
+		}
+		Bills detail = baseMapper.selectById(bills.getId());
+		SeaBillsDetail seaBillsDetail = seaBillsDetailService.getOne(new LambdaQueryWrapper<SeaBillsDetail>()
+			.eq(SeaBillsDetail::getTenantId, AuthUtil.getTenantId())
+			.eq(SeaBillsDetail::getPid, detail.getId()));
+		if (seaBillsDetail != null) {
+			seaBillsDetail.setId(null);
+		} else {
+			seaBillsDetail = new SeaBillsDetail();
+		}
+		detail.setDetail(seaBillsDetail);
+		List<PreContainers> preContainersList = preContainersService.list(new LambdaQueryWrapper<PreContainers>()
+			.eq(PreContainers::getIsDeleted, 0)
+			.eq(PreContainers::getTenantId, AuthUtil.getTenantId())
+			.eq(PreContainers::getPid, detail.getId()));
+		for (PreContainers item : preContainersList) {
+			item.setPid(null);
+			item.setId(null);
+			item.setContainerNumberStatus("录入");
+		}
+		Bills copyBills = new Bills();
+		BeanUtil.copyProperties(detail, copyBills);
+		copyBills.setId(null);
+		copyBills.setIssueStatus("0");
+		copyBills.setBillNo("");
+		copyBills.setMblno("");
+		copyBills.setHblno("");
+		copyBills.setRefno("");
+		copyBills.setBookingNo("");
+		copyBills.setMasterBillNo(null);
+		copyBills.setMasterId(null);
+		copyBills.setSplitOrderSum(0);
+		copyBills.setTeuTotal(0);
+		copyBills.setStatus(0);
+		copyBills.setBillStatus(0);
+		copyBills.setBillingStatus(0);
+		copyBills.setWhetherSail(null);
+		copyBills.setLogisticsStatus(null);
+		copyBills.setWhetherReachHarbor(null);
+		copyBills.setWhetherCancel(null);
+		copyBills.setTransferOrderStatus(null);
+		copyBills.setChangeOrderDate(null);
+		copyBills.setReturnDate(null);
+		copyBills.setReturnEmptyDate(null);
+		copyBills.setClearanceDate(null);
+		copyBills.setReceiveStatus(null);
+		copyBills.setChangeOrdersStatus(null);
+		copyBills.setReturningSecurityMoneyStatus(null);
+		copyBills.setAmountDr(new BigDecimal("0.00"));
+		copyBills.setAmountCr(new BigDecimal("0.00"));
+		copyBills.setAmountProfit(new BigDecimal("0.00"));
+		copyBills.setAmountDrUsd(new BigDecimal("0.00"));
+		copyBills.setAmountCrUsd(new BigDecimal("0.00"));
+		copyBills.setAmountProfitUsd(new BigDecimal("0.00"));
+		copyBills.setAmountDrLoc(new BigDecimal("0.00"));
+		copyBills.setAmountCrLoc(new BigDecimal("0.00"));
+		copyBills.setAmountProfitLoc(new BigDecimal("0.00"));
+		copyBills.setCheckDrStatus(0);
+		copyBills.setCheckDrStatusDescr("未对账");
+		copyBills.setCheckCrStatus(0);
+		copyBills.setCheckCrStatusDescr("未申请");
+		copyBills.setStlDrStatus(0);
+		copyBills.setStlDrStatusDescr("未结");
+		copyBills.setStlCrStatus(0);
+		copyBills.setStlCrStatusDescr("未结");
+		copyBills.setInvoiceDrStatus(0);
+		copyBills.setInvoiceDrStatusDescr("未开");
+		copyBills.setInvoiceCrStatus(0);
+		copyBills.setInvoiceCrStatusDescr("未开");
+		copyBills.setBillStatus(0);
+		copyBills.setAccountStatus(0);
+		copyBills.setSplitOrderSum(0);
+		copyBills.setPreContainersList(preContainersList);
+		copyBills.setCfsQuantity(new BigDecimal("0.00"));
+		copyBills.setCfsGrossWeight(new BigDecimal("0.00"));
+		copyBills.setCfsMeasurement(new BigDecimal("0.00"));
+		copyBills.setContainersList(new ArrayList<>());
+		copyBills.setContainersReportsList(new ArrayList<>());
+		copyBills.setWaitingBoxList(new ArrayList<>());
+		copyBills.setFeeCenterList(new ArrayList<>());
+		copyBills.setFeeCenterAmendList(new ArrayList<>());
+		return copyBills;
+	}
+
 	/**
 	 * 删除海运进出口明细表
 	 *

blade-service/blade-los/src/main/java/org/springblade/los/view/mapper/FinanceProfitMapper.xml

@@ -79,7 +79,8 @@
         seb.amount_dr_loc AS amountDrLoc,
         seb.real_amount_dr_loc AS realAmountDrLoc,
         seb.amount_cr_loc AS amountCrLoc,
-        seb.real_amount_cr_loc AS realAmountCrLoc
+        seb.real_amount_cr_loc AS realAmountCrLoc,
+        seb.branch_name as branchId
         FROM
         los_finance_profit seb
         WHERE
@@ -189,7 +190,8 @@
         seb.amount_dr_loc AS amountDrLoc,
         seb.real_amount_dr_loc AS realAmountDrLoc,
         seb.amount_cr_loc AS amountCrLoc,
-        seb.real_amount_cr_loc AS realAmountCrLoc
+        seb.real_amount_cr_loc AS realAmountCrLoc,
+        seb.branch_name as branchId
         FROM
         los_finance_profit seb
         WHERE