b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ 合同结算币种贯通应收应付与结算，并完善合同编号与字段

Browse Source 
合同结算币种写入应收应付与预结算；总单运费默认币种统一为 RMB；同步合同申请日期、主要内容、部门合同编号前缀及用印材料字典等能力。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
b2894lxlx
2026-10-10 00:53:17 +08:00
parent ef9eab737f
commit e20afc0d55
18 changed files with 229 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
+2
View File
@@ -13,6 +13,7 @@
<result column="dept_category" property="deptCategory"/>
<result column="dept_code" property="deptCode"/>
<result column="kingdee_dept_code" property="kingdeeDeptCode"/>
<result column="contract_code_prefix" property="contractCodePrefix"/>
<result column="short_name" property="shortName"/>
<result column="pinyin_mnemonic" property="pinyinMnemonic"/>
<result column="mnemonic_code" property="mnemonicCode"/>
@@ -34,6 +35,7 @@
<result column="dept_category" property="deptCategory"/>
<result column="dept_code" property="deptCode"/>
<result column="kingdee_dept_code" property="kingdeeDeptCode"/>
<result column="contract_code_prefix" property="contractCodePrefix"/>
<result column="short_name" property="shortName"/>
<result column="pinyin_mnemonic" property="pinyinMnemonic"/>
<result column="mnemonic_code" property="mnemonicCode"/>
blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ContractManageController.java
+9 -1
View File
@@ -177,8 +177,16 @@ public class ContractManageController extends BladeController {
return R.data(contractManageService.expireStats(contractManage));
}
@GetMapping("/export-contract-manage")
@GetMapping("/next-contract-no")
@ApiOperationSupport(order = 16)
@Operation(summary = "预览下一合同编号", description = "按合同负责部门编码前缀+年份+三位流水预览")
public R<String> nextContractNo(
@Parameter(description = "合同负责部门ID", required = true) @RequestParam Long organizationId) {
return R.data(contractManageService.nextContractNo(organizationId));
}
@GetMapping("/export-contract-manage")
@ApiOperationSupport(order = 17)
@Operation(summary = "导出合同管理")
public void exportContractManage(ContractManageVO contractManage, @RequestParam(required = false) String ids, HttpServletResponse response) {
List<ContractManageExcel> list = contractManageService.exportContractManage(contractManage, ids);
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ContractManageExcel.java
+8 -2
View File
@@ -56,7 +56,7 @@ public class ContractManageExcel implements Serializable {
private String contractName;
@ExcelProperty("所属项目")
private String projectName;
@ExcelProperty("所属组织")
@ExcelProperty("合同负责部门")
private String organizationName;
@ExcelProperty("合同类别")
private String contractCategory;
@@ -76,6 +76,10 @@ public class ContractManageExcel implements Serializable {
private LocalDate temporaryEndDate;
@ExcelProperty("经办人")
private String handlerUserName;
@ExcelProperty("签订日期")
private LocalDate signDate;
@ExcelProperty("申请日期")
private LocalDate applyDate;
@ExcelProperty("合同阶段")
private String contractStage;
@ExcelProperty("审核状态")
@@ -105,7 +109,9 @@ public class ContractManageExcel implements Serializable {
private String currentNode;
@ExcelProperty("当前处理人")
private String currentProcessor;
@ExcelProperty("备注")
@ExcelProperty("合同主要内容")
private String mainContent;
@ExcelProperty("其他事项说明")
private String remark;
@ExcelProperty("创建人")
private String createUserName;
blade-service/blade-transport/src/main/java/org/springblade/transport/service/IContractManageService.java
+8
View File
@@ -64,4 +64,12 @@ public interface IContractManageService extends BaseService<ContractManage> {
Map<String, Long> expireStats(ContractManageVO contractManage);
List<ContractManageExcel> exportContractManage(ContractManageVO contractManage, String ids);
/**
* 预览下一合同编号（按合同负责部门前缀 + 年份 + 三位流水）
*
* @param organizationId 合同负责部门ID
* @return 预览编号
*/
String nextContractNo(Long organizationId);
}
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java
+68 -8
View File
@@ -32,7 +32,9 @@ import org.springblade.core.tenant.annotation.TenantIgnore;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.cache.SysCache;
import org.springblade.system.cache.UserCache;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.transport.excel.ContractManageExcel;
import org.springblade.transport.mapper.ContractManageMapper;
import org.springblade.transport.pojo.entity.ContractManage;
@@ -55,6 +57,8 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 合同管理 服务实现类
@@ -190,6 +194,8 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
contractManage.setApprovalStatus(STATUS_REVIEWING);
contractManage.setCurrentNode("正式合同审批");
contractManage.setCurrentProcessor("待处理");
// 正式合同提交时刷新申请日期为当天
contractManage.setApplyDate(LocalDate.now());
return updateById(contractManage);
}
@@ -301,6 +307,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
source.setOriginalContractNo(TransportBusinessSupport.trimToNull(request.getOriginalContractNo()));
source.setElectronicSealFlag(request.getElectronicSealFlag());
normalizeOptionalIntegerFields(source);
validateContractAmountRequired(source);
validateAdditionalFields(source);
source.setBillingPlanJson(request.getBillingPlanJson()); source.setSettlementRuleJson(request.getSettlementRuleJson()); source.setPreSettlementConfigJson(request.getPreSettlementConfigJson()); source.setFormalSettlementConfigJson(request.getFormalSettlementConfigJson()); source.setPaymentRatioJson(request.getPaymentRatioJson());
source.setContractFileJson(request.getContractFileJson()); source.setAttachmentsJson(request.getAttachmentsJson());
@@ -375,6 +382,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
target.setCurrentNode(null);
target.setCurrentProcessor(null);
target.setApprovedTime(null);
target.setApplyDate(null);
target.setChangeContent(null);
target.setChangeReason(null);
target.setChangeAttachmentsJson(null);
@@ -493,13 +501,12 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
private void prepareCreateOrUpdate(ContractManage contractManage) {
if (Func.isEmpty(contractManage.getId())) {
if (Func.isEmpty(contractManage.getContractNo())) {
contractManage.setContractNo("HT" + LocalDate.now().toString().replace("-", "") + String.format("%06d", count() + 1));
}
if (Func.isEmpty(contractManage.getOrganizationId())) {
contractManage.setOrganizationId(TransportBusinessSupport.currentDeptId("合同管理"));
contractManage.setOrganizationName(TransportBusinessSupport.currentDept("合同管理").getDeptName());
}
// 新增始终按部门规则生成合同编号，避免前端预览号并发冲突
contractManage.setContractNo(nextContractNo(contractManage.getOrganizationId()));
if (Func.isEmpty(contractManage.getHandlerUserId())) {
contractManage.setHandlerUserId(AuthUtil.getUserId());
contractManage.setHandlerUserName(AuthUtil.getUserName());
@@ -526,6 +533,48 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
}
}
@Override
public synchronized String nextContractNo(Long organizationId) {
if (Func.isEmpty(organizationId)) {
throw new ServiceException("请选择合同负责部门");
}
Dept dept = SysCache.getDept(organizationId);
if (dept == null) {
throw new ServiceException("合同负责部门不存在");
}
String prefix = TransportBusinessSupport.trimToNull(dept.getContractCodePrefix());
if (Func.isEmpty(prefix)) {
throw new ServiceException("请先在组织机构中配置该部门的合同编码前缀");
}
int year = LocalDate.now().getYear();
String head = prefix + "（" + year + "）";
List<ContractManage> latestList = list(Wrappers.<ContractManage>lambdaQuery()
.select(ContractManage::getContractNo)
.eq(ContractManage::getIsDeleted, 0)
.eq(ContractManage::getOrganizationId, organizationId)
.likeRight(ContractManage::getContractNo, head)
.orderByDesc(ContractManage::getContractNo)
.last("LIMIT 50"));
Pattern pattern = Pattern.compile("^" + Pattern.quote(prefix) + "（" + year + "）(\\d{3})号$");
int next = 1;
for (ContractManage item : latestList) {
String contractNo = TransportBusinessSupport.trimToNull(item.getContractNo());
if (Func.isEmpty(contractNo)) {
continue;
}
Matcher matcher = pattern.matcher(contractNo);
if (!matcher.matches()) {
continue;
}
next = Integer.parseInt(matcher.group(1)) + 1;
break;
}
if (next > 999) {
throw new ServiceException("当前部门本年合同流水号已达上限999");
}
return head + String.format("%03d", next) + "号";
}
private void refreshArchiveStatusOnApprove(ContractManage contractManage) {
if (hasSealArchiveFile(contractManage.getContractFileJson())) {
contractManage.setArchiveStatus(ARCHIVE_STATUS_ARCHIVED);
@@ -595,7 +644,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
}
for (Map.Entry<String, Map<String, Object>> entry : originalApproved.entrySet()) {
if (!requestKeys.contains(entry.getKey())) {
throw new ServiceException("已审核通过的合同文件不允许删除");
throw new ServiceException("已审核通过的用印材料不允许删除");
}
}
return merged.isEmpty() ? null : JsonUtil.toJson(merged);
@@ -671,7 +720,8 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
TransportBusinessSupport.validateRequired(contractManage.getContractName(), "请输入合同名称");
TransportBusinessSupport.validateRequired(contractManage.getContractCategory(), "请选择合同类别");
// 合同名称允许重复，唯一性由合同编号保证。
TransportBusinessSupport.validateLength(contractManage.getRemark(), 2000, "备注不能超过2000字");
TransportBusinessSupport.validateLength(contractManage.getMainContent(), 1000, "合同主要内容不能超过1000字");
TransportBusinessSupport.validateLength(contractManage.getRemark(), 2000, "其他事项说明不能超过2000字");
}
private void validateBillingPlans(String billingPlanJson) {
@@ -812,9 +862,10 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
TransportBusinessSupport.validateRequired(contractManage.getContractName(), "请输入合同名称");
TransportBusinessSupport.validateRequired(contractManage.getContractCategory(), "请选择合同类型");
TransportBusinessSupport.validateRequired(contractManage.getProjectName(), "请选择所属项目");
TransportBusinessSupport.validateRequired(contractManage.getOrganizationName(), "请选择所属组织");
TransportBusinessSupport.validateRequired(contractManage.getOrganizationName(), "请选择合同负责部门");
TransportBusinessSupport.validateRequired(contractManage.getPartyA(), "请选择甲方");
TransportBusinessSupport.validateRequired(contractManage.getPartyB(), "请选择乙方");
validateContractAmountRequired(contractManage);
}
/**
@@ -845,18 +896,26 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
TransportBusinessSupport.validateRequired(contractManage.getContractName(), "请输入合同名称");
TransportBusinessSupport.validateRequired(contractManage.getContractCategory(), "请选择合同类型");
TransportBusinessSupport.validateRequired(contractManage.getProjectName(), "请选择所属项目");
TransportBusinessSupport.validateRequired(contractManage.getOrganizationName(), "请选择所属组织");
TransportBusinessSupport.validateRequired(contractManage.getOrganizationName(), "请选择合同负责部门");
TransportBusinessSupport.validateRequired(contractManage.getSettlementCurrency(), "请选择结算币种");
TransportBusinessSupport.validateRequired(contractManage.getPartyA(), "请输入甲方");
TransportBusinessSupport.validateRequired(contractManage.getPartyB(), "请输入乙方");
TransportBusinessSupport.validateRequired(contractManage.getStartDate() == null ? null : contractManage.getStartDate().toString(), "请选择合同期限");
TransportBusinessSupport.validateRequired(contractManage.getSignDate() == null ? null : contractManage.getSignDate().toString(), "请选择签订日期");
TransportBusinessSupport.validateDateRange(contractManage.getStartDate(), contractManage.getEndDate(), "合同期限开始日期不能晚于结束日期");
TransportBusinessSupport.validateLength(contractManage.getRemark(), 2000, "备注不能超过2000字");
validateContractAmountRequired(contractManage);
TransportBusinessSupport.validateLength(contractManage.getMainContent(), 1000, "合同主要内容不能超过1000字");
TransportBusinessSupport.validateLength(contractManage.getRemark(), 2000, "其他事项说明不能超过2000字");
validateBillingPlans(contractManage.getBillingPlanJson());
validatePaymentRatios(contractManage.getPaymentRatioJson());
}
private void validateContractAmountRequired(ContractManage contractManage) {
if (contractManage.getContractAmount() == null) {
throw new ServiceException("请输入合同金额");
}
}
private ContractManage loadExists(Long id) {
ContractManage contractManage = getById(id);
if (Func.isEmpty(contractManage) || Objects.equals(contractManage.getIsDeleted(), 1)) {
@@ -969,6 +1028,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
data.put("templateFlag", contractManage.getTemplateFlag());
data.put("originalContractNo", contractManage.getOriginalContractNo());
data.put("electronicSealFlag", contractManage.getElectronicSealFlag());
data.put("mainContent", contractManage.getMainContent());
data.put("remark", contractManage.getRemark());
data.put("feeGenerationMode", contractManage.getFeeGenerationMode());
data.put("billingPlanJson", contractManage.getBillingPlanJson());
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MasterOrderServiceImpl.java
+1 -1
View File
@@ -677,7 +677,7 @@ public class MasterOrderServiceImpl extends BaseServiceImpl<MasterOrderMapper, M
freight.put("freightTotal", freightTotal);
freight.put("totalFreightAmount", freightTotal.add(Objects.requireNonNullElse(nullableDecimal(dispatch, "otherFeeTotal"), BigDecimal.ZERO)));
freight.put("otherFreightAmount", string(dispatch, "otherFeeTotal", ""));
freight.put("currency", string(dispatch, "currency", "CNY"));
freight.put("currency", string(dispatch, "currency", "RMB"));
return JsonUtil.toJson(freight);
}
private String waybillGroupKey(Map<String, Object> dispatch) { return String.join("\u0000", string(dispatch, "segmentNo", ""), string(dispatch, "carrierType", ""), string(dispatch, "carrierContractId", ""), string(dispatch, "carrierName", ""), string(dispatch, "driverName", ""), string(dispatch, "driverPhone", ""), string(dispatch, "vehicleNo", ""), string(dispatch, "captainName", ""), string(dispatch, "containerNo", ""), string(dispatch, "cabinNo", "")); }
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PreSettlementServiceImpl.java
+20 -2
View File
@@ -319,7 +319,7 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
}
if (contractChanged) {
settlement.setSettlementType(contractSettlementType(contract));
settlement.setCurrency(LOCAL_CURRENCY);
settlement.setCurrency(resolveContractCurrency(contract));
summaryFeeMapper.delete(Wrappers.<PreSettlementSummaryFee>lambdaQuery()
.eq(PreSettlementSummaryFee::getPreSettlementId, settlement.getId()));
}
@@ -329,7 +329,7 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
settlement.setSettlementType(resolveSettlementType(request, contract));
settlement.setApprovalStatus(STATUS_DRAFT);
settlement.setCurrentNode("草稿");
settlement.setCurrency(LOCAL_CURRENCY);
settlement.setCurrency(resolveContractCurrency(contract));
settlement.setLocalCurrency(LOCAL_CURRENCY);
}
fillContract(settlement, contract);
@@ -1280,6 +1280,24 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
}
}
/**
* 预结算单结算币种取自合同结算币种，CNY 归一为 RMB。
*/
private String resolveContractCurrency(ContractManage contract) {
if (contract == null || Func.isEmpty(contract.getSettlementCurrency())) {
return LOCAL_CURRENCY;
}
String code = contract.getSettlementCurrency().trim().toUpperCase();
int separatorIndex = code.indexOf(" - ");
if (separatorIndex > 0) {
code = code.substring(0, separatorIndex).trim();
}
if ("CNY".equals(code)) {
return LOCAL_CURRENCY;
}
return Func.isEmpty(code) ? LOCAL_CURRENCY : code;
}
private String resolveSettlementType(PreSettlementSaveRequest request, ContractManage contract) {
if (Boolean.TRUE.equals(request.getAllowSourceMismatch()) && Func.isNotEmpty(request.getSettlementType())) {
validateSettlementType(request.getSettlementType());
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceivablePayableDetailServiceImpl.java
+42 -1
View File
@@ -80,6 +80,7 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
@@ -1468,7 +1469,7 @@ public class ReceivablePayableDetailServiceImpl
detail.setMileage(normalizeGeneratedMileage(waybill.getMileage()));
detail.setBatchNo(waybill.getBatchNo());
detail.setUnitPrice(unitPrice);
detail.setCurrency("RMB");
detail.setCurrency(resolveCurrency(contract, waybill));
detail.setFreightAmount(freight);
detail.setOtherFeeAmount(other);
detail.setTotalAmount(total);
@@ -2523,6 +2524,7 @@ public class ReceivablePayableDetailServiceImpl
detail.setOtherFeeAmount(total.subtract(freight));
detail.setTotalAmount(total);
detail.setUnitPrice(resolveContractUnitPrice(fees));
detail.setCurrency(resolveCurrency(contract, waybill));
detail.setFeeItemsJson(aggregateFeeItemsJson(fees));
updateById(detail);
}
@@ -2554,6 +2556,7 @@ public class ReceivablePayableDetailServiceImpl
detail.setOtherFeeAmount(total.subtract(freight));
detail.setTotalAmount(total);
detail.setUnitPrice(resolveContractUnitPrice(fees));
detail.setCurrency(resolveCurrency(contract, masterGoods.isEmpty() ? null : masterGoods.get(0)));
detail.setFeeItemsJson(aggregateFeeItemsJson(fees));
updateById(detail);
}
@@ -2588,6 +2591,7 @@ public class ReceivablePayableDetailServiceImpl
detail.setOtherFeeAmount(total.subtract(freight));
detail.setTotalAmount(total);
detail.setUnitPrice(resolveContractUnitPrice(fees));
detail.setCurrency(resolveCurrency(contract, waybills.get(0)));
detail.setFeeItemsJson(aggregateFeeItemsJson(fees));
updateById(detail);
}
@@ -2886,6 +2890,43 @@ public class ReceivablePayableDetailServiceImpl
return map;
}
/**
* 结算币种优先取合同 settlementCurrency，其次运单 freightJson.currency，默认 RMB。
*/
private String resolveCurrency(ContractManage contract, Waybill waybill) {
if (contract != null && Func.isNotEmpty(contract.getSettlementCurrency())) {
return normalizeCurrencyCode(contract.getSettlementCurrency());
}
String freightCurrency = extractFreightCurrency(waybill);
if (Func.isNotEmpty(freightCurrency)) {
return normalizeCurrencyCode(freightCurrency);
}
return "RMB";
}
private String extractFreightCurrency(Waybill waybill) {
if (waybill == null || Func.isEmpty(waybill.getFreightJson())) {
return null;
}
Object currency = parseMap(waybill.getFreightJson()).get("currency");
return currency == null ? null : String.valueOf(currency);
}
private String normalizeCurrencyCode(String currency) {
if (Func.isEmpty(currency)) {
return "RMB";
}
String code = currency.trim().toUpperCase(Locale.ROOT);
int separatorIndex = code.indexOf(" - ");
if (separatorIndex > 0) {
code = code.substring(0, separatorIndex).trim();
}
if ("CNY".equals(code)) {
return "RMB";
}
return code;
}
private Map<String, Object> parseMap(String json) {
if (Func.isEmpty(json)) {
return new LinkedHashMap<>();
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java
+26 -5
View File
@@ -1062,10 +1062,13 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
waybill.setMasterNo(null);
waybill.setMileageRemark(null);
}
// 新建若已带业务状态（如复制提交）则在过程校正后回写，保证与原运单一致
// 新建若已带业务状态（如复制提交已完成）则在过程校正后回写，保证与原运单一致
String preservedBusinessStatus = created
? TransportBusinessSupport.trimToNull(waybill.getBusinessStatus())
: null;
if (isCompletedBusinessStatus(preservedBusinessStatus)) {
preservedBusinessStatus = "completed";
}
// 无过程快照时按项目回填；再按接单设置决定 pending / running
fillProjectProcessConfig(waybill);
prepare(waybill);
@@ -1360,17 +1363,35 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
}
/**
* 新建/复制运单若业务状态为已完成，按合同系统计费模式生成应收、应付明细。
* <p>使用同事务入口，避免 REQUIRES_NEW 读不到尚未提交的新运单。</p>
* 新建/复制运单若业务状态为已完成，按与「完成运单」相同的合同系统计费规则生成应收、应付明细。
* <p>使用同事务入口 {@link IReceivablePayableDetailService#generateForImportedWaybills}，
* 避免 {@code generateForCompletedWaybills} 的 REQUIRES_NEW 读不到尚未提交的新运单。</p>
*/
private void generateReceivablePayableIfCompleted(Waybill waybill) {
if (waybill == null || Func.isEmpty(waybill.getId())) {
return;
}
if (!"completed".equals(waybill.getBusinessStatus())) {
Waybill saved = getById(waybill.getId());
if (saved == null || Objects.equals(saved.getIsDeleted(), 1)) {
return;
}
receivablePayableDetailService.generateForImportedWaybills(List.of(waybill));
String businessStatus = TransportBusinessSupport.trimToNull(saved.getBusinessStatus());
if (Func.isEmpty(businessStatus)) {
businessStatus = TransportBusinessSupport.trimToNull(waybill.getBusinessStatus());
}
if (!isCompletedBusinessStatus(businessStatus)) {
return;
}
// 统一落库英文状态码，与完成运单、列表展示口径一致
if (!"completed".equals(businessStatus)) {
saved.setBusinessStatus("completed");
updateById(saved);
}
receivablePayableDetailService.generateForImportedWaybills(List.of(saved));
}
private static boolean isCompletedBusinessStatus(String businessStatus) {
return "completed".equals(businessStatus) || "已完成".equals(businessStatus);
}
@Override