Merge remote-tracking branch 'origin/dev' into dev

base-server/src/main/resources/application.yml

@@ -114,8 +114,8 @@ zt:
       - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
       - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
   swagger:
-    title: 管理后台
-    description: 提供管理员管理的所有功能
+    title: Base 模块
+    description: 提供基础管理模块的所有功能
     version: ${zt.info.version}
   tenant: # 多租户相关配置项
     enable: true

pom.xml

@@ -211,6 +211,12 @@
                 <config.namespace>liss</config.namespace>
             </properties>
         </profile>
+        <profile>
+            <id>qsj</id>
+            <properties>
+                <config.namespace>qsj</config.namespace>
+            </properties>
+        </profile>
     </profiles>
 
 </project>

zt-module-base/zt-module-base-server/pom.xml

@@ -42,6 +42,12 @@
             <version>${revision}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-erp-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
         <!-- 业务组件 -->
         <dependency>
             <groupId>com.zt.plat</groupId>

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/MaterialInfomationController.java

@@ -101,4 +101,12 @@ public class MaterialInfomationController {
                         BeanUtils.toBean(list, MaterialInfomationRespVO.class));
     }
 
+    @GetMapping("/getOneTest")
+    @Operation(summary = "测试获取生产版本")
+    @PreAuthorize("@ss.hasPermission('base:material-infomation:query')")
+    public CommonResult<String> getTest() {
+        String getOneTest = materialInfomationService.getOneTest();
+        return success(getOneTest);
+    }
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialInfomationService.java

@@ -61,4 +61,5 @@ public interface MaterialInfomationService {
      */
     PageResult<MaterialInfomationDO> getMaterialInfomationPage(MaterialInfomationPageReqVO pageReqVO);
 
+    String getOneTest();
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialInfomationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zt.plat.module.base.service.base;
 
 import cn.hutool.core.collection.CollUtil;
+import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationPageReqVO;
@@ -8,6 +9,8 @@ import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationRespVO
 import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationSaveReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.MaterialInfomationDO;
 import com.zt.plat.module.base.dal.mysql.base.MaterialInfomationMapper;
+import com.zt.plat.module.erp.api.ErpExternalApi;
+import com.zt.plat.module.erp.api.dto.ErpProductiveVersionReqDTO;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -29,6 +32,10 @@ public class MaterialInfomationServiceImpl implements MaterialInfomationService
     @Resource
     private MaterialInfomationMapper materialInfomationMapper;
 
+    @Resource
+    private ErpExternalApi erpExternalApi;
+
+
     @Override
     public MaterialInfomationRespVO createMaterialInfomation(MaterialInfomationSaveReqVO createReqVO) {
         // 插入
@@ -86,4 +93,14 @@ public class MaterialInfomationServiceImpl implements MaterialInfomationService
         return materialInfomationMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public String getOneTest() {
+        ErpProductiveVersionReqDTO reqDTO = new ErpProductiveVersionReqDTO();
+        reqDTO.setFactoryNumber("5020");
+        reqDTO.setMaterialNumber("224814");
+        CommonResult<String> erpProductiveVersion = erpExternalApi.getErpProductiveVersionByFM(reqDTO);
+        return erpProductiveVersion.getData();
+    }
+
+
 }

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/DeductRespDTO.java

@@ -32,10 +32,10 @@ public class DeductRespDTO {
     private String rangeWay;
 
     @Schema(description = "上限")
-    private String up;
+    private BigDecimal up;
 
     @Schema(description = "下限")
-    private String down;
+    private BigDecimal down;
 
     @Schema(description = "类型(字典：STLM_COEF)")
     private String type;

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java

@@ -145,8 +145,8 @@ public class ContractController implements BusinessControllerMarker {
     @PostMapping("/submit/erp")
     @Operation(summary = "提交ERP")
     @PreAuthorize("@ss.hasPermission('base:contract:erp')")
-    public CommonResult<List<String>> submitErp(@RequestBody List<Long> ids) {
-        return success(contractService.submitErp(ids));
+    public CommonResult<JSONObject> submitErp(@RequestParam("id") Long id) {
+        return success(contractService.submitErp(id));
     }
 
     @GetMapping("/list/up-not-relation")

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractPageReqVO.java

@@ -38,4 +38,7 @@ public class ContractPageReqVO extends PageParam {
 
     @Schema(description = "本币金额;与ERP(HTBWBZJE)对应")
     private BigDecimal basicAmount;
+
+    @Schema(description = "合同分类(字典：SPLY_BSN_TP)")
+    private String businessType;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductRespVO.java

@@ -31,10 +31,10 @@ public class DeductRespVO {
     private String rangeWay;
 
     @Schema(description = "上限")
-    private String up;
+    private BigDecimal up;
 
     @Schema(description = "下限")
-    private String down;
+    private BigDecimal down;
 
     @Schema(description = "类型(字典：STLM_COEF)")
     private String type;