单证分组

blade-service-api/blade-los-api/src/main/java/org/springblade/los/documentTypes/entity/BDocumentTypes.java

@@ -113,6 +113,12 @@ public class BDocumentTypes implements Serializable {
 		@ApiModelProperty(value = "组别名称")
 		private String groupCode;
 	/**
+	 * 报表编码
+	 */
+	@ApiModelProperty(value = "报表编码")
+	private String reportsType;
+
+	/**
 	* 参数
 	*/
 		@ApiModelProperty(value = "参数")

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

@@ -2301,7 +2301,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocC(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity().setScale(2) + "*" + item.getPrice().setScale(2));
+					feeCenterReports.setAmount(item.getQuantity().setScale(2, RoundingMode.HALF_UP) + "*" + item.getPrice().setScale(2, RoundingMode.HALF_UP));
 					feeCenterReports.setExrate(item.getExrate());
 					feeCenterReports.setQuantity(item.getQuantity());
 					feeCenterReports.setUnitNo(item.getUnitNo());
@@ -3868,7 +3868,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocD(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity().setScale(2) + "*" + item.getPrice().setScale(2));
+					feeCenterReports.setAmount(item.getQuantity().setScale(2, RoundingMode.HALF_UP) + "*" + item.getPrice().setScale(2, RoundingMode.HALF_UP));
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				if (!feeCenterList.isEmpty()) {
@@ -3997,7 +3997,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocD(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity().setScale(2) + "*" + item.getPrice().setScale(2));
+					feeCenterReports.setAmount(item.getQuantity().setScale(2, RoundingMode.HALF_UP) + "*" + item.getPrice().setScale(2, RoundingMode.HALF_UP));
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				if (!feeCenterList.isEmpty()) {
@@ -4125,7 +4125,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocC(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity().setScale(2) + "*" + item.getPrice().setScale(2));
+					feeCenterReports.setAmount(item.getQuantity().setScale(2, RoundingMode.HALF_UP) + "*" + item.getPrice().setScale(2, RoundingMode.HALF_UP));
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				if (!feeCenterList.isEmpty()) {
@@ -4244,7 +4244,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocC(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity().setScale(2) + "*" + item.getPrice().setScale(2));
+					feeCenterReports.setAmount(item.getQuantity().setScale(2, RoundingMode.HALF_UP) + "*" + item.getPrice().setScale(2, RoundingMode.HALF_UP));
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				if (!feeCenterList.isEmpty()) {
@@ -4390,7 +4390,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocC(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity().setScale(2) + "*" + item.getPrice().setScale(2));
+					feeCenterReports.setAmount(item.getQuantity().setScale(2, RoundingMode.HALF_UP) + "*" + item.getPrice().setScale(2, RoundingMode.HALF_UP));
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				if (!feeCenterList.isEmpty()) {
@@ -4508,7 +4508,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocC(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity().setScale(2) + "*" + item.getPrice().setScale(2));
+					feeCenterReports.setAmount(item.getQuantity().setScale(2, RoundingMode.HALF_UP) + "*" + item.getPrice().setScale(2, RoundingMode.HALF_UP));
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				if (!feeCenterList.isEmpty()) {
@@ -7005,7 +7005,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocD(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity().setScale(2) + "*" + item.getPrice().setScale(2));
+					feeCenterReports.setAmount(item.getQuantity().setScale(2, RoundingMode.HALF_UP) + "*" + item.getPrice().setScale(2, RoundingMode.HALF_UP));
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				if (!feeCenterList.isEmpty()) {
@@ -7119,7 +7119,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocD(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity().setScale(2) + "*" + item.getPrice().setScale(2));
+					feeCenterReports.setAmount(item.getQuantity().setScale(2, RoundingMode.HALF_UP) + "*" + item.getPrice().setScale(2, RoundingMode.HALF_UP));
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				if (!feeCenterList.isEmpty()) {
@@ -7232,7 +7232,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocC(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity().setScale(2) + "*" + item.getPrice().setScale(2));
+					feeCenterReports.setAmount(item.getQuantity().setScale(2, RoundingMode.HALF_UP) + "*" + item.getPrice().setScale(2, RoundingMode.HALF_UP));
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				if (!feeCenterList.isEmpty()) {
@@ -7336,7 +7336,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					}
 					feeCenterReports.setAmountLocC(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
-					feeCenterReports.setAmount(item.getQuantity().setScale(2) + "*" + item.getPrice().setScale(2));
+					feeCenterReports.setAmount(item.getQuantity().setScale(2, RoundingMode.HALF_UP) + "*" + item.getPrice().setScale(2, RoundingMode.HALF_UP));
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				if (!feeCenterList.isEmpty()) {

blade-service/blade-los/src/main/java/org/springblade/los/documentTypes/controller/BDocumentTypesController.java → blade-service/blade-los/src/main/java/org/springblade/los/documentTypes/controller/DocumentTypesController.java

@@ -30,12 +30,11 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.los.basic.fees.entity.BFees;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.los.documentTypes.entity.BDocumentTypes;
 import org.springblade.los.documentTypes.vo.BDocumentTypesVO;
-import org.springblade.los.documentTypes.service.IBDocumentTypesService;
+import org.springblade.los.documentTypes.service.IDocumentTypesService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;
@@ -50,9 +49,9 @@ import java.util.List;
 @AllArgsConstructor
 @RequestMapping("/bdocumenttypes")
 @Api(value = "业务-单证中心分组，各分公司独立", tags = "业务-单证中心分组，各分公司独立接口")
-public class BDocumentTypesController extends BladeController {
+public class DocumentTypesController extends BladeController {
 
-	private final IBDocumentTypesService bDocumentTypesService;
+	private final IDocumentTypesService documentTypesService;
 
 	/**
 	 * 详情
@@ -61,7 +60,7 @@ public class BDocumentTypesController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入bDocumentTypes")
 	public R<BDocumentTypes> detail(BDocumentTypes bDocumentTypes) {
-		BDocumentTypes detail = bDocumentTypesService.getOne(Condition.getQueryWrapper(bDocumentTypes));
+		BDocumentTypes detail = documentTypesService.getOne(Condition.getQueryWrapper(bDocumentTypes));
 		return R.data(detail);
 	}
 
@@ -72,7 +71,7 @@ public class BDocumentTypesController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入bDocumentTypes")
 	public R<IPage<BDocumentTypes>> list(BDocumentTypes bDocumentTypes, Query query) {
-		IPage<BDocumentTypes> pages = bDocumentTypesService.page(Condition.getPage(query), Condition.getQueryWrapper(bDocumentTypes));
+		IPage<BDocumentTypes> pages = documentTypesService.page(Condition.getPage(query), Condition.getQueryWrapper(bDocumentTypes));
 		return R.data(pages);
 	}
 
@@ -83,7 +82,7 @@ public class BDocumentTypesController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入bDocumentTypes")
 	public R<IPage<BDocumentTypesVO>> page(BDocumentTypesVO bDocumentTypes, Query query) {
-		IPage<BDocumentTypesVO> pages = bDocumentTypesService.selectBDocumentTypesPage(Condition.getPage(query), bDocumentTypes);
+		IPage<BDocumentTypesVO> pages = documentTypesService.selectBDocumentTypesPage(Condition.getPage(query), bDocumentTypes);
 		return R.data(pages);
 	}
 
@@ -103,7 +102,7 @@ public class BDocumentTypesController extends BladeController {
 			.eq(ObjectUtils.isNotNull(doc.getGroupCode()), BDocumentTypes::getGroupCode, doc.getGroupCode());
 		lqw.orderByAsc(BDocumentTypes::getLineNo);
 
-		List<BDocumentTypes> pages = bDocumentTypesService.list(lqw);
+		List<BDocumentTypes> pages = documentTypesService.list(lqw);
 		return R.data(pages);
 	}
 
@@ -114,7 +113,7 @@ public class BDocumentTypesController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入bDocumentTypes")
 	public R save(@Valid @RequestBody BDocumentTypes bDocumentTypes) {
-		return R.status(bDocumentTypesService.save(bDocumentTypes));
+		return R.status(documentTypesService.save(bDocumentTypes));
 	}
 
 	/**
@@ -124,7 +123,7 @@ public class BDocumentTypesController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入bDocumentTypes")
 	public R update(@Valid @RequestBody BDocumentTypes bDocumentTypes) {
-		return R.status(bDocumentTypesService.updateById(bDocumentTypes));
+		return R.status(documentTypesService.updateById(bDocumentTypes));
 	}
 
 	/**
@@ -134,7 +133,7 @@ public class BDocumentTypesController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入bDocumentTypes")
 	public R submit(@Valid @RequestBody BDocumentTypes bDocumentTypes) {
-		return R.status(bDocumentTypesService.saveOrUpdate(bDocumentTypes));
+		return R.status(documentTypesService.saveOrUpdate(bDocumentTypes));
 	}
 
 
@@ -145,7 +144,7 @@ public class BDocumentTypesController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(bDocumentTypesService.removeByIds(Func.toLongList(ids)));
+		return R.status(documentTypesService.removeByIds(Func.toLongList(ids)));
 	}
 
 

blade-service/blade-los/src/main/java/org/springblade/los/documentTypes/mapper/BDocumentTypesMapper.java → blade-service/blade-los/src/main/java/org/springblade/los/documentTypes/mapper/DocumentTypesMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.los.documentTypes.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.springblade.los.documentTypes.entity.BDocumentTypes;
 import org.springblade.los.documentTypes.vo.BDocumentTypesVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -28,7 +29,8 @@ import java.util.List;
  * @author BladeX
  * @since 2025-08-26
  */
-public interface BDocumentTypesMapper extends BaseMapper<BDocumentTypes> {
+@Mapper
+public interface DocumentTypesMapper extends BaseMapper<BDocumentTypes> {
 
 	/**
 	 * 自定义分页

blade-service/blade-los/src/main/java/org/springblade/los/documentTypes/mapper/BDocumentTypesMapper.xml → blade-service/blade-los/src/main/java/org/springblade/los/documentTypes/mapper/DocumentTypesMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.los.documentTypes.mapper.BDocumentTypesMapper">
+<mapper namespace="org.springblade.los.documentTypes.mapper.DocumentTypesMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="bDocumentTypesResultMap" type="org.springblade.los.documentTypes.entity.BDocumentTypes">
@@ -18,6 +18,7 @@
         <result column="type_name" property="typeName"/>
         <result column="classify_code" property="classifyCode"/>
         <result column="group_code" property="groupCode"/>
+        <result column="reports_type" property="reportsType"/>
         <result column="params" property="params"/>
         <result column="line_no" property="lineNo"/>
         <result column="version" property="version"/>

blade-service/blade-los/src/main/java/org/springblade/los/documentTypes/service/IBDocumentTypesService.java → blade-service/blade-los/src/main/java/org/springblade/los/documentTypes/service/IDocumentTypesService.java

@@ -27,7 +27,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  * @author BladeX
  * @since 2025-08-26
  */
-public interface IBDocumentTypesService extends IService<BDocumentTypes> {
+public interface IDocumentTypesService extends IService<BDocumentTypes> {
 
 	/**
 	 * 自定义分页

blade-service/blade-los/src/main/java/org/springblade/los/documentTypes/service/impl/BDocumentTypesServiceImpl.java → blade-service/blade-los/src/main/java/org/springblade/los/documentTypes/service/impl/DocumentTypesServiceImpl.java

@@ -18,8 +18,8 @@ package org.springblade.los.documentTypes.service.impl;
 
 import org.springblade.los.documentTypes.entity.BDocumentTypes;
 import org.springblade.los.documentTypes.vo.BDocumentTypesVO;
-import org.springblade.los.documentTypes.mapper.BDocumentTypesMapper;
-import org.springblade.los.documentTypes.service.IBDocumentTypesService;
+import org.springblade.los.documentTypes.mapper.DocumentTypesMapper;
+import org.springblade.los.documentTypes.service.IDocumentTypesService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,7 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  * @since 2025-08-26
  */
 @Service
-public class BDocumentTypesServiceImpl extends ServiceImpl<BDocumentTypesMapper, BDocumentTypes> implements IBDocumentTypesService {
+public class DocumentTypesServiceImpl extends ServiceImpl<DocumentTypesMapper, BDocumentTypes> implements IDocumentTypesService {
 
 	@Override
 	public IPage<BDocumentTypesVO> selectBDocumentTypesPage(IPage<BDocumentTypesVO> page, BDocumentTypesVO bDocumentTypes) {

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

@@ -58,6 +58,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
@@ -165,8 +166,8 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 					// item.getPid() + "-" + item.getCorpId() + "-" + item.getDc() + "-" + item.getFeeCode() + "-" + item.getCurCode() + "-" + amountStatus;
 					String eleCode = "D".equals(item.getDc()) ? "3" : item.getElementsCode();
 					String billKey = isAuditing + item.getPid() + "-" + item.getCorpId() + "-" + item.getDc() + "-" + eleCode + "-" + item.getCurCode() + "-" + amountStatus;
-					billKey += ObjectUtils.isNotNull(item.getTaxRate()) ? "-" + item.getTaxRate().setScale(3).toString() : "-0";
-					billKey += ObjectUtils.isNotNull(item.getSurchargeRate()) ? "-" + item.getSurchargeRate().setScale(3).toString() : "-0";
+					billKey += ObjectUtils.isNotNull(item.getTaxRate()) ? "-" + item.getTaxRate().setScale(3, RoundingMode.HALF_UP).toString() : "-0";
+					billKey += ObjectUtils.isNotNull(item.getSurchargeRate()) ? "-" + item.getSurchargeRate().setScale(3, RoundingMode.HALF_UP).toString() : "-0";
 					item.setBillKey(billKey);
 				} else {
 					throw new RuntimeException("单据号、单位、费用类型、核算要素不能为空");
@@ -569,8 +570,8 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 					// item.getPid() + "-" + item.getCorpId() + "-" + item.getDc() + "-" + item.getFeeCode() + "-" + item.getCurCode() + "-" + amountStatus;
 					String eleCode = "D".equals(item.getDc()) ? "3" : item.getElementsCode();
 					String billKey = isAuditing + item.getPid() + "-" + item.getCorpId() + "-" + item.getDc() + "-" + eleCode + "-" + item.getCurCode() + "-" + amountStatus;
-					billKey += ObjectUtils.isNotNull(item.getTaxRate()) ? "-" + item.getTaxRate().setScale(3).toString() : "-0";
-					billKey += ObjectUtils.isNotNull(item.getSurchargeRate()) ? "-" + item.getSurchargeRate().setScale(3).toString() : "-0";
+					billKey += ObjectUtils.isNotNull(item.getTaxRate()) ? "-" + item.getTaxRate().setScale(3, RoundingMode.HALF_UP).toString() : "-0";
+					billKey += ObjectUtils.isNotNull(item.getSurchargeRate()) ? "-" + item.getSurchargeRate().setScale(3, RoundingMode.HALF_UP).toString() : "-0";
 					item.setBillKey(billKey);
 				} else {
 					throw new RuntimeException("单据号、单位、费用类型、费用名称不能为空");