zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
潘荣晟
2025-10-28 17:53:16 +08:00
parent 475609b3b2 4106f89107
commit 73ca047ede
23 changed files with 497 additions and 1526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,9 +2,8 @@ package com.zt.plat.module.contractorder.api;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.module.contractorder.api.dto.order.PurchaseOrderWithDetailsDTO;
import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
import com.zt.plat.module.contractorder.api.vo.contract.ContractSaveReqVO;
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.enums.ApiConstants;
import io.swagger.v3.oas.annotations.Operation;
@@ -35,15 +34,11 @@ public interface ContractApi {
@Operation(summary = "通过订单编号获取订单信息", description = "通过订单编号获取订单信息")
CommonResult<List<PurchaseOrderWithDetailsDTO>> getOrderByOrderNo(@RequestBody List<String> orderNoS);
@PostMapping(PREFIX + "/create")
@Operation(summary = "创建合同")
CommonResult<Boolean> create(@Valid @RequestBody ContractSaveReqVO reqVO);
@PostMapping(PREFIX + "/order-by-order-id")
@Operation(summary = "通过订单id获取订单信息", description = "通过订单编号获取订单信息")
CommonResult<List<PurchaseOrderWithDetailsDTO>> getOrderByOrderIds(@RequestBody List<Long> ids);
@PostMapping(PREFIX + "/send")
@PostMapping(PREFIX + "/push")
@Operation(summary = "国贸2.0系统创建合同调用")
CommonResult<Boolean> push(@Valid @RequestBody ContractRequest reqVO);
CommonResult<Boolean> push(@Valid @RequestBody ContractRequest reqVO) throws Exception;
}

3
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractPageReqVO.java
View File

@@ -6,7 +6,6 @@ import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -34,7 +33,7 @@ public class ContractPageReqVO extends PageParam {
@Schema(description = "签署日期;与ERP(HTQDRQ)对应")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] signDate;
private String[] signDate;
@Schema(description = "本币金额;与ERP(HTBWBZJE)对应")
private BigDecimal basicAmount;

9
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/international/Account.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.contractorder.api.vo.contract.international;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/*
@@ -7,12 +8,20 @@ import lombok.Data;
*/
@Data
public class Account {
@Schema(description = "收付款账号行号")
private String accountSourceId; // 收付款账号行号
@Schema(description = "收付款账号编号")
private String accountSourceCode; // 收付款账号编号
@Schema(description = "类别")
private String accountType; // 类别
@Schema(description = "名称")
private String accountName; // 名称
@Schema(description = "开户银行")
private String bankAccountName; // 开户银行
@Schema(description = "银行账号")
private String bankAccountNo; // 银行账号
@Schema(description = "纳税人识别号")
private String identificationNumber; // 纳税人识别号
@Schema(description = "地址、电话")
private String addressPhoneTel; // 地址、电话
}

89
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/international/ContractRequest.java
View File

File diff suppressed because it is too large Load Diff

23
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/international/Freight.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.contractorder.api.vo.contract.international;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -8,26 +9,48 @@ import java.math.BigDecimal;
*/
@Data
public class Freight {
@Schema(description = "费用明细行号")
private String freightSourceId; // 费用明细行号
@Schema(description = "费用明细编号")
private String freightSourceCode; // 费用明细编号
@Schema(description = "发货地编号")
private String beginSiteCode; // 发货地编号
@Schema(description = "发货地名称")
private String beginSiteName; // 发货地名称
@Schema(description = "详细地址")
private String beginSiteAddress; // 详细地址
@Schema(description = "收货地编码")
private String endSiteCode; // 收货地编码
@Schema(description = "收货地名称")
private String endSiteName; // 收货地名称
@Schema(description = "详细地址")
private String endSiteAddress; // 详细地址
@Schema(description = "运输方式 (10-汽运;20-船运;30-水汽联运)")
private String contractTypeDispatch; // 运输方式 (10-汽运;20-船运;30-水汽联运)
@Schema(description = "费用类型 (包干费、汽运费、港口费...)")
private String feeTypeCode; // 费用类型 (包干费、汽运费、港口费...)
@Schema(description = "费用名称")
private String feeTypeName; // 费用名称
@Schema(description = "是否乙方提货")
private String isPartybPickup; // 是否乙方提货
@Schema(description = "乙方提货单价")
private BigDecimal partybPickupPrice; // 乙方提货单价
@Schema(description = "费用大类")
private String feeCategoryL; // 费用大类
@Schema(description = "费用小类")
private String feeCategoryS; // 费用小类
@Schema(description = "标的仓")
private String goodsStorage; // 标的仓
@Schema(description = "标的物")
private String categoryName; // 标的物
@Schema(description = "免堆期")
private BigDecimal noHeapDays; // 免堆期
@Schema(description = "计费单位 (01-元/吨; 02-元/40GP; 03-元/20GP; 04-元/车)")
private String quantityUnitCode; // 计费单位 (01-元/吨; 02-元/40GP; 03-元/20GP; 04-元/车)
@Schema(description = "单价")
private BigDecimal priceWithtax; // 单价
@Schema(description = "税率(%)")
private BigDecimal priceTaxRate; // 税率(%)
@Schema(description = "费用承担")
private String costBearing; // 费用承担
}

15
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/international/GoodsSite.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.contractorder.api.vo.contract.international;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/*
@@ -7,18 +8,32 @@ import lombok.Data;
*/
@Data
public class GoodsSite {
@Schema(description = "收发港站点行号")
private String goodsSiteSourceId; // 收发港站点行号
@Schema(description = "收发港站点编号")
private String goodsSiteSourceCode; // 收发港站点编号
@Schema(description = "标的物分类")
private String subMattercategoryLevel; // 标的物分类
@Schema(description = "标的物编码")
private String subMattercategoryCode; // 标的物编码
@Schema(description = "标的物名称")
private String subMatterCategoryName; // 标的物名称
@Schema(description = "地点类型 (QY-区域; GK-港口; MT-码头; CK-仓库)")
private String beginSiteType; // 地点类型 (QY-区域; GK-港口; MT-码头; CK-仓库)
@Schema(description = "发货地编号")
private String beginSiteCode; // 发货地编号
@Schema(description = "发货地名称")
private String beginSiteName; // 发货地名称
@Schema(description = "详细地址")
private String beginSiteAddress; // 详细地址
@Schema(description = "地点类型")
private String endSiteType; // 地点类型
@Schema(description = "收货地编号")
private String endSiteCode; // 收货地编号
@Schema(description = "收货地名称")
private String endSiteName; // 收货地名称
@Schema(description = "详细地址")
private String endSiteAddress; // 详细地址
@Schema(description = "运输方式 (10-汽运;20-船运;30-水汽联运)")
private String contractTypeDispatch; // 运输方式 (10-汽运;20-船运;30-水汽联运)
}

9
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/international/LoadingRequirement.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.contractorder.api.vo.contract.international;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/*
@@ -7,12 +8,20 @@ import lombok.Data;
*/
@Data
public class LoadingRequirement {
@Schema(description = "货物装卸行号")
private String loadingReqSourceId; // 货物装卸行号
@Schema(description = "货物装卸编号")
private String loadingReqSourceCode; // 货物装卸编号
@Schema(description = "提货地责任方")
private String deliveredAtPlace; // 提货地责任方
@Schema(description = "提货地费用承担方")
private String deliveredAtFeeparty; // 提货地费用承担方
@Schema(description = "终到地责任方")
private String destinationResponsibleParty; // 终到地责任方
@Schema(description = "终到地费用承担方")
private String intermediateStationParty; // 终到地费用承担方
@Schema(description = "中间站责任方")
private String destinationResponsibleFeeparty; // 中间站责任方
@Schema(description = "中间站费用承担方")
private String intermediateResponsibleFeeparty; // 中间站费用承担方
}

15
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/international/Partner.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.contractorder.api.vo.contract.international;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/*
@@ -7,15 +8,29 @@ import lombok.Data;
*/
@Data
public class Partner {
@Schema(description = "客商信息行号")
private String partnerSourceId; // 客商信息行号
@Schema(description = "客商信息编码")
private String partnerSourceCode; // 客商信息编码
@Schema(description = "供应商名称")
private String partnerName; // 供应商名称
@Schema(description = "供应商代码")
private String partnerCode; // 供应商代码
@Schema(description = "对方法定代表人")
private String legalRepresentative; // 对方法定代表人
@Schema(description = "币种")
private String partnerCurrency; // 币种
@Schema(description = "对方联系人")
private String contactPerson; // 对方联系人
@Schema(description = "对方联系人联系方式")
private String contactInformation; // 对方联系人联系方式
@Schema(description = "是否内部交易")
private String internalTransaction; // 是否内部交易
@Schema(description = "客商类型")
private String partnerType; // 客商类型
@Schema(description = "境内/外")
private String domesticOrOverseas; // 境内/外
@Schema(description = "erp合同编号")
private String erpContractPaperNumber; // erp合同编号
}

14
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/international/ReceivingAddr.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.contractorder.api.vo.contract.international;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/*
@@ -7,17 +8,30 @@ import lombok.Data;
*/
@Data
public class ReceivingAddr {
@Schema(description = "接货地址行号")
private String recivingAddrSourceId; // 接货地址行号
@Schema(description = "接货地址编号")
private String recivingAddrSourceCode; // 接货地址编号
@Schema(description = "标的物分类")
private String categoryLevel; // 标的物分类
@Schema(description = "标的物编码")
private String ccCategoryCode; // 标的物编码
@Schema(description = "标的物名称")
private String categoryName; // 标的物名称
@Schema(description = "接货编码")
private String siteCode; // 接货编码
@Schema(description = "接货名称")
private String siteName; // 接货名称
@Schema(description = "地址类型 (QY-区域; GK-港口; MT-码头; CK-仓库)")
private String siteType; // 地址类型 (QY-区域; GK-港口; MT-码头; CK-仓库)
@Schema(description = "详细地址")
private String siteAddress; // 详细地址
@Schema(description = "专用线")
private String consigneePrivatewire; // 专用线
@Schema(description = "收货人")
private String consignerContact; // 收货人
@Schema(description = "联系人")
private String contactPerson; // 联系人
@Schema(description = "联系电话")
private String contactPhone; // 联系电话
}

5
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/international/ServiceFee.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.contractorder.api.vo.contract.international;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/*
@@ -7,8 +8,12 @@ import lombok.Data;
*/
@Data
public class ServiceFee {
@Schema(description = "服务费用项目行号")
private String serviceFeeSourceId; // 服务费用项目行号
@Schema(description = "服务费用项目编号")
private String serviceFeeSourceCode; // 服务费用项目编号
@Schema(description = "服务项目名称")
private String serviceFeeName; // 服务项目名称
@Schema(description = "计费类别")
private String expenseType; // 计费类别
}

Some files were not shown because too many files have changed in this diff Show More