新增国贸2.0系统合同分页查询接口

修改国贸2.0系统合同创建接口：合同类型修改
合同主信息添加代理方名称字段

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

@@ -2,9 +2,11 @@ package com.zt.plat.module.contractorder.api;
 
 
 import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
 import com.zt.plat.module.contractorder.api.dto.order.PurchaseOrderWithDetailsDTO;
-import com.zt.plat.module.contractorder.api.vo.contract.international.ContractRequest;
+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.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -39,6 +41,10 @@ public interface ContractApi {
     CommonResult<List<PurchaseOrderWithDetailsDTO>> getOrderByOrderIds(@RequestBody List<Long> ids);
 
     @PostMapping(PREFIX + "/push")
-    @Operation(summary = "国贸2.0系统创建合同调用")
+    @Operation(summary = "国贸2.0系统创建合同")
-    CommonResult<Boolean> push(@Valid @RequestBody ContractRequest reqVO) throws Exception;
+    CommonResult<Boolean> push(@Valid @RequestBody IntContract reqVO) throws Exception;
+
+    @GetMapping(PREFIX + "/logistics/list/page")
+    @Operation(summary = "国贸2.0系统合同分页查询")
+    CommonResult<PageResult<IntContract>> logisticsListPage(IntContractPageReq pageReq);
 }

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

@@ -233,6 +233,9 @@ public class ContractRespDTO {
     @Schema(description = "合同分类(字典：SPLY_BSN_TP)")
     private String businessType;
 
+    @Schema(description = "代理方名称")
+    private String agentName;
+
     // 物料信息
     private List<DetailRespDTO> detail;
 

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java

@@ -236,6 +236,9 @@ public class ContractRespVO {
     @Schema(description = "合同分类(字典：SPLY_BSN_TP)")
     private String businessType;
 
+    @Schema(description = "代理方名称")
+    private String agentName;
+
     // 物料信息
     private List<DetailRespVO> detail;
 

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractSaveReqVO.java

@@ -208,6 +208,9 @@ public class ContractSaveReqVO {
     @Schema(description = "合同分类(字典：SPLY_BSN_TP)")
     private String businessType;
 
+    @Schema(description = "代理方名称")
+    private String agentName;
+
     // 物料信息
     private List<DetailSaveReqVO> detail;
 

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/international/IntContract.java

@@ -10,7 +10,7 @@ import java.util.List;
  * 合同请求主实体
  */
 @Data
-public class ContractRequest {
+public class IntContract {
 
     // 基础信息
     @Schema(description = "操作标志")

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/international/IntContractPageReq.java

@@ -0,0 +1,13 @@
+package com.zt.plat.module.contractorder.api.vo.contract.international;
+
+import com.zt.plat.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class IntContractPageReq extends PageParam {
+    @Schema(description = "合同编号")
+    private String contractCode;
+    @Schema(description = "合同名称")
+    private String contractName;
+}

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/contract/DictEnum.java

@@ -8,6 +8,15 @@ import lombok.Getter;
 @Getter
 public enum DictEnum {
 
+    /** 供应链业务大类 */
+    SPLY_BSN_TP_03BX("货物保险","03BX",null),
+    SPLY_BSN_TP_11CC("货物保管仓储","11CC",null),
+    SPLY_BSN_TP_10YS("货物运输","10YS",null),
+    SPLY_BSN_TP_13HD("货运代理","13HD",null),
+    SPLY_BSN_TP_ENTED("来料加工","ENTED",null),
+    SPLY_BSN_TP_ENT("委托加工","ENT",null),
+    SPLY_BSN_TP_PUR("采购","PUR",null),
+    SPLY_BSN_TP_SALE("销售","SALE",null),
     /** 业务类型 */
     BSN_TP_3("物流合同","3",null),
     /** ERP合同类型编码 */

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

@@ -394,4 +394,9 @@ public class ContractMainDO extends BusinessBaseDO {
      */
     @TableField("BSN_TP")
     private String businessType;
+    /**
+     * 代理方名称
+     */
+    @TableField("AGT_NAME")
+    private String agentName;
 }