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

Merge branch 'refs/heads/dev' into test

Browse Source
This commit is contained in:
liss
2025-10-28 16:53:37 +08:00
parent 088e7ee26b 1585b5611a
commit f8fa25eaba
26 changed files with 766 additions and 1534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java
View File

@@ -260,7 +260,7 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
code = TmplStsEnum.STOPPED.getCode();
} else if (reqVO.getType().equals("enable")) {
// 启用
code = TmplStsEnum.START.getCode();
code = TmplStsEnum.DRAFT.getCode();
}
if (code.isEmpty()) {
throw exception(ILLEGAL_OPERATION_TYPE);

10
zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml
View File

@@ -30,11 +30,17 @@
left join SPLY_ERP_CPN c on r.ERP_NUM = c.NUM
where d.DELETED = 0
and d.IS_COMPANY = 1
<if test="erpNumber != null">
and c.NUM = #{erpNumber}
</if>
<if test="number != null">
and d.CODE = #{number}
</if>
<if test="name != null">
and d.NAME = #{name}
and d.NAME like concat('%', #{name}, '%')
</if>
<if test="erpName != null">
and c.NAME = #{erpName}
and c.NAME like concat('%', #{erpName}, '%')
</if>
<if test="manager != null">
and d.LEADER_USER_ID = #{manager}

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

@@ -2,16 +2,14 @@ package com.zt.plat.module.contractorder.api;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.module.contractorder.api.dto.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;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -36,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;
}

2
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/PrchOrdDtlDTO.java → zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/PrchOrdDtlDTO.java
View File

@@ -1,4 +1,4 @@
package com.zt.plat.module.contractorder.api.dto;
package com.zt.plat.module.contractorder.api.dto.order;
import lombok.Data;

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

@@ -1,4 +1,4 @@
package com.zt.plat.module.contractorder.api.dto;
package com.zt.plat.module.contractorder.api.dto.order;
import lombok.Data;
@@ -189,5 +189,12 @@ public class PurchaseOrderWithDetailsDTO {
* 订单类型
*/
private String splyBsnTp;
private List<PrchOrdDtlDTO> orderDetails;
/**
* 采购订单明细
*/
private List<PrchOrdDtlDTO> prchOrdDtlDTOS;
/**
* 消费订单明细
*/
private List<SalesOrdDtlDTO> salesOrdDtlDTOS;
}

137
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/SalesOrdDtlDTO.java Normal file
View File

File diff suppressed because it is too large Load Diff

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; // 费用承担
}

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