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

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/config/RestTemplateConfig.java

@@ -0,0 +1,34 @@
+package com.zt.plat.module.contractorder.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.web.client.RestTemplate;
+
+import java.nio.charset.Charset;
+
+/**
+ * RestTemplate配置类
+ * @author ChenZhaoxue
+ * @date 2025/3/27
+ */
+@Configuration
+public class RestTemplateConfig {
+ 
+    @Bean
+    public RestTemplate restTemplate(ClientHttpRequestFactory factory){
+		RestTemplate restTemplate = new RestTemplate(factory);
+		restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(Charset.forName("UTF-8")));
+		return restTemplate;
+    }
+ 
+    @Bean
+    public ClientHttpRequestFactory simpleClientHttpRequestFactory(){
+        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+        factory.setConnectTimeout(10000);//单位为ms
+        factory.setReadTimeout(30000);//单位为ms
+        return factory;
+    }
+}

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

@@ -6,9 +6,11 @@ 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.contractorder.api.ContractApi;
+import com.zt.plat.module.contractorder.api.dto.order.PurchaseOrderWithDetailsDTO;
 import com.zt.plat.module.contractorder.api.vo.contract.*;
 import com.zt.plat.module.contractorder.api.vo.contract.international.IntContract;
 import com.zt.plat.module.contractorder.api.vo.contract.international.IntContractPageReq;
+import com.zt.plat.module.contractorder.api.vo.contract.international.IntPushContractReqVO;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO;
 import com.zt.plat.module.contractorder.service.contract.ContractService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -195,14 +197,21 @@ public class ContractController implements BusinessControllerMarker {
     @PostMapping("/push")
     @Operation(summary = "国贸2.0系统推送合同")
     @PreAuthorize("@ss.hasPermission('base:contract:create')")
-    CommonResult<Boolean> push(@Valid @RequestBody IntContract reqVO) {
-        return contractApi.push(reqVO);
+    public void push(@Valid @RequestBody IntPushContractReqVO pushReqVO) {
+        contractApi.push(pushReqVO);
     }
 
     @PostMapping("/logistics/list/page")
     @Operation(summary = "国贸2.0系统合同分页查询")
     @PreAuthorize("@ss.hasPermission('base:contract:query')")
-    CommonResult<PageResult<IntContract>> logisticsListPage(IntContractPageReq pageReq) {
+    public CommonResult<PageResult<IntContract>> logisticsListPage(IntContractPageReq pageReq) {
         return contractApi.logisticsListPage(pageReq);
     }
+
+    @PostMapping("/order-by-order-no")
+    @Operation(summary = "通过订单编号获取订单信息", description = "通过订单编号获取订单信息")
+    @PreAuthorize("@ss.hasPermission('base:contract:query')")
+    public CommonResult<List<PurchaseOrderWithDetailsDTO>> getOrderByOrderNo(@RequestBody List<String> orderNoS){
+        return contractApi.getOrderByOrderNo(orderNoS);
+    };
 }

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

@@ -1,13 +1,16 @@
 package com.zt.plat.module.contractorder.controller.admin.contractorder;
 
+import com.zt.plat.module.contractorder.api.dto.order.PurchaseOrderWithDetailsDTO;
+import com.zt.plat.module.contractorder.service.contract.ContractService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.*;
 
 import com.zt.plat.framework.common.pojo.CommonResult;
 
+import java.util.List;
+
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 /**
@@ -20,10 +23,12 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RequestMapping("/admin/contract-order/contract-order")
 public class ContractOrderController {
 
+    @Resource
+    private ContractService contractService;
+
     @GetMapping("/hello")
     @Operation(summary = "Hello ContractOrder")
     public CommonResult<String> hello() {
         return success("Hello, ContractOrder!");
     }
-
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractMainDO.java

@@ -3,6 +3,7 @@ package com.zt.plat.module.contractorder.dal.dataobject.contract;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 import lombok.*;
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -205,12 +206,12 @@ public class ContractMainDO extends BusinessBaseDO {
     @TableField("RMK")
     private String remark;
     /**
-     * 施工类型编号;与ERP(HTLXBH)对应，拓展信息
+     * 施工类型编号(字典:ERP_CTRT_HTLXBH);与ERP(HTLXBH)对应，拓展信息
      */
     @TableField("CON_TP_NUM")
     private String constructionTypeNumber;
     /**
-     * 施工类型名称;与ERP(HTLXMC)对应，拓展信息
+     * 施工类型名称(字典:ERP_CTRT_HTLXBH);与ERP(HTLXMC)对应，拓展信息
      */
     @TableField("CON_TP_NAME")
     private String constructionTypeName;
@@ -258,7 +259,7 @@ public class ContractMainDO extends BusinessBaseDO {
      * 建筑服务发生地;与ERP(JZFWFSD)对应，拓展信息，销售合同，且类型为SAP02COSR必填
      */
     @TableField("ARCH_SVC_PLCE")
-    private String architectureServicePlace;
+    private String architectureService‌Place;
     /**
      * 达到收款条件金额;与ERP(DDSKJE)对应，拓展信息，销售合同，且类型为SAP02COSR必填
      */
@@ -399,4 +400,9 @@ public class ContractMainDO extends BusinessBaseDO {
      */
     @TableField("AGT_NAME")
     private String agentName;
+    /**
+     * 货权转移类型(字典：ASY_MTNG_TP)
+     */
+    @TableField("MTNG_TP")
+    private String meteringType;
 }