From 5dc2358a8b5bd7eb0a399ab38addea5e8505b196 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Thu, 23 Oct 2025 10:31:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E8=A1=A8=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/contract/ContractServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index 9cc0d785..66edd9fd 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -1613,12 +1613,12 @@ public class ContractServiceImpl implements ContractService { // PARTNER 对方客商编号 收支方向判断，如果为“支出”，传“ERP乙方公司编码”，反之传“ERP甲方公司编码” // INEDR 1-借(销售合同)，2-贷(采购合同) 收支方向判断，如果为“支出”，传“2”，反之传“1” if (DictEnum.ERP_RCV_DLVY_EXPENSES.getCode().equals(contractMainDO.getDirection())) { - pageReqVO.setContractSignNumber(contractMainDO.getSalesCompanyNumber()); - pageReqVO.setSupplierNumber(contractMainDO.getSalesCompanyNumber()); + pageReqVO.setContractSignNumber(contractMainDO.getErpPurchaseCompanyNumber()); + pageReqVO.setSupplierNumber(contractMainDO.getErpSalesCompanyNumber()); pageReqVO.setContractCategory("2"); } else if (DictEnum.ERP_RCV_DLVY_INCOME.getCode().equals(contractMainDO.getDirection())) { - pageReqVO.setContractSignNumber(contractMainDO.getSalesCompanyNumber()); - pageReqVO.setSupplierNumber(contractMainDO.getSalesCompanyNumber()); + pageReqVO.setContractSignNumber(contractMainDO.getErpSalesCompanyNumber()); + pageReqVO.setSupplierNumber(contractMainDO.getErpPurchaseCompanyNumber()); pageReqVO.setContractCategory("1"); } // ZHTBH 合同编号 合同编号:CTRT_PPR_NUM @@ -1665,10 +1665,10 @@ public class ContractServiceImpl implements ContractService { // 合同签订主体编号:CTRT_SGN_NUM 根据合同主表的收支方向判断，如果为“支出”，值为“ERP甲方公司名称”，反之为“ERP乙方公司名称” if (DictEnum.ERP_RCV_DLVY_EXPENSES.getCode().equals(contractMainDO.getDirection())) { erpContractVO.setContractImplementNumber(contractMainDO.getErpPurchaseCompanyNumber()); - erpContractVO.setContractSignNumber(contractMainDO.getErpPurchaseCompanyName()); + erpContractVO.setContractSignNumber(contractMainDO.getErpPurchaseCompanyNumber()); } else if (DictEnum.ERP_RCV_DLVY_INCOME.getCode().equals(contractMainDO.getDirection())) { erpContractVO.setContractImplementNumber(contractMainDO.getErpSalesCompanyNumber()); - erpContractVO.setContractSignNumber(contractMainDO.getErpSalesCompanyName()); + erpContractVO.setContractSignNumber(contractMainDO.getErpSalesCompanyNumber()); } // 合同签订日期:SGN_DT if (contractMainDO.getSignDate() != null) { From 75e4ffcad17264d73bb427e5041211cdc2c99136 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Thu, 23 Oct 2025 11:06:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=8E=9F=E5=B8=81=E9=87=91=E9=A2=9D-?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=90=8E=E3=80=81=E6=9C=AC=E5=B8=81=E9=87=91?= =?UTF-8?q?=E9=A2=9D-=E5=8F=98=E6=9B=B4=E5=90=8E=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contractorder/service/contract/ContractServiceImpl.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index 66edd9fd..07b78ebb 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -52,7 +52,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.ByteArrayOutputStream; -import java.math.BigDecimal; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -174,10 +173,6 @@ public class ContractServiceImpl implements ContractService { contractMainDO.setStatus(DictEnum.BSE_CTRT_STS_DRAFT.getCode()); // 生成系统合同编号 contractMainDO.setSystemContractNumber(generateSystemContractNumber(reqVO.getBusinessType())); - // 原币金额-变更后 - if (contractMainDO.getChangeCooAmount() == null) contractMainDO.setChangeCooAmount(new BigDecimal(0)); - // 本币金额-变更后 - if (contractMainDO.getChangeBasicAmount() == null) contractMainDO.setChangeBasicAmount(new BigDecimal(0)); // 保存合同主信息 contractMainMapper.insert(contractMainDO); From 678ee43ebc5c894916e8d3ba4b83af7cb78deaf9 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Thu, 23 Oct 2025 11:12:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4erp=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/contract/ContractServiceImpl.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index 07b78ebb..8d506317 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -1373,18 +1373,14 @@ public class ContractServiceImpl implements ContractService { private JSONObject sendToErp(ErpContractSaveReqVO erpContractVO) { JSONObject erpResult = new JSONObject(); - try { - HashMap result = erpContractService.submitErp(erpContractVO); - if ("E".equals(result.get("flag"))) { - erpResult.putOnce("success", false); - erpResult.putOnce("errMsg", result.get("resStr")+":"+result.get("E_RESP")); - } else { - erpResult.putOnce("success", true); - erpResult.putOnce("data", result); - } - } catch (Exception e) { + + HashMap result = erpContractService.submitErp(erpContractVO); + if ("E".equals(result.get("flag"))) { erpResult.putOnce("success", false); - erpResult.putOnce("errMsg", e.getMessage()); + erpResult.putOnce("errMsg", result.get("resStr")+":"+result.get("E_RESP")); + } else { + erpResult.putOnce("success", true); + erpResult.putOnce("data", result); } return erpResult; From a04df5982fc649a8777739d31e61ee2bb681b8d5 Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Thu, 23 Oct 2025 11:17:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=91=E5=B1=9E=E5=85=83=E7=B4=A0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/admin/base/vo/ElementPageReqVO.java | 3 +++ .../module/base/controller/admin/base/vo/ElementRespVO.java | 4 ++++ .../base/controller/admin/base/vo/ElementSaveReqVO.java | 5 +++++ .../zt/plat/module/base/dal/dataobject/base/ElementDO.java | 5 +++++ .../zt/plat/module/base/dal/mysql/base/ElementMapper.java | 1 + 5 files changed, 18 insertions(+) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java index a93ea208..73d4cafe 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java @@ -25,6 +25,9 @@ public class ElementPageReqVO extends PageParam { @Schema(description = "品位单位") private String gradeUnit; + @Schema(description = "小数位数") + private Long decimalValue; + @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java index 9f7c0fec..f58b14e7 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java @@ -28,6 +28,10 @@ public class ElementRespVO { @ExcelProperty("金属元素编码") private String coding; + @Schema(description = "小数位数", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("小数位数") + private Long decimalValue; + @Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("品位单位") private String gradeUnit; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java index eafee0ca..6c932298 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java @@ -1,5 +1,6 @@ package com.zt.plat.module.base.controller.admin.base.vo; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; import lombok.Data; @@ -23,6 +24,10 @@ public class ElementSaveReqVO { // @NotEmpty(message = "金属元素编码不能为空") private String coding; + @Schema(description = "小数位数") + @NotEmpty(message = "小数位数不能为空") + private Long decimalValue; + @Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "品位单位不能为空") private String gradeUnit; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java index 39c32502..ba2870dd 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java @@ -44,6 +44,11 @@ public class ElementDO extends BusinessBaseDO { @TableField("CDG") private String coding; /** + * 小数位数 + */ + @TableField("DEC") + private Long decimalValue; + /** * 品位单位 */ @TableField("GRD_UNT") diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java index 665280c1..24b5a91c 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java @@ -19,6 +19,7 @@ public interface ElementMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(ElementDO::getAbbreviation, reqVO.getAbbreviation()) .likeIfPresent(ElementDO::getName, reqVO.getName()) + .eqIfPresent(ElementDO::getDecimalValue, reqVO.getDecimalValue()) .eqIfPresent(ElementDO::getCoding, reqVO.getCoding()) .eqIfPresent(ElementDO::getGradeUnit, reqVO.getGradeUnit()) .betweenIfPresent(ElementDO::getCreateTime, reqVO.getCreateTime())