Merge branch 'refs/heads/dev' into test

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;

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;

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;

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")

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<ElementDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<ElementDO>()
                 .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())

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);
@@ -1378,18 +1373,14 @@ public class ContractServiceImpl implements ContractService {
 
     private JSONObject sendToErp(ErpContractSaveReqVO erpContractVO) {
         JSONObject erpResult = new JSONObject();
-        try {
+
-            HashMap<String, String> result = erpContractService.submitErp(erpContractVO);
+        HashMap<String, String> result = erpContractService.submitErp(erpContractVO);
-            if ("E".equals(result.get("flag"))) {
+        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) {
             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;
@@ -1613,12 +1604,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.setContractSignNumber(contractMainDO.getErpPurchaseCompanyNumber());
-            pageReqVO.setSupplierNumber(contractMainDO.getSalesCompanyNumber());
+            pageReqVO.setSupplierNumber(contractMainDO.getErpSalesCompanyNumber());
             pageReqVO.setContractCategory("2");
         } else if (DictEnum.ERP_RCV_DLVY_INCOME.getCode().equals(contractMainDO.getDirection())) {
-            pageReqVO.setContractSignNumber(contractMainDO.getSalesCompanyNumber());
+            pageReqVO.setContractSignNumber(contractMainDO.getErpSalesCompanyNumber());
-            pageReqVO.setSupplierNumber(contractMainDO.getSalesCompanyNumber());
+            pageReqVO.setSupplierNumber(contractMainDO.getErpPurchaseCompanyNumber());
             pageReqVO.setContractCategory("1");
         }
         // ZHTBH 合同编号 合同编号:CTRT_PPR_NUM
@@ -1665,10 +1656,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) {