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

委托加工和来料加工feign接口字段映射

Browse Source
This commit is contained in:
潘荣晟
2026-02-11 17:12:00 +08:00
parent 92375c0dde
commit a6f3b028fb
16 changed files with 683 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java
View File

File diff suppressed because it is too large Load Diff

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/OriginalMaterialProcessingDetailController.java
View File

@@ -107,4 +107,6 @@ public class OriginalMaterialProcessingDetailController implements BusinessContr
BeanUtils.toBean(list, OriginalMaterialProcessingDetailRespVO.class));
}
}

12
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailPageReqVO.java
View File

@@ -115,4 +115,16 @@ public class OriginalMaterialProcessingDetailPageReqVO extends PageParam {
@Schema(description = "金属元素编码")
private String elementNumber;
@Schema(description = "行号")
private Integer lineNumber;
@Schema(description = "发票类型")
private String invoiceType;
@Schema(description = "物料科目分配组")
private String metalAcctasscatGroup;
@Schema(description = "税率")
private BigDecimal taxRte;
}

11
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailRespVO.java
View File

@@ -145,5 +145,16 @@ public class OriginalMaterialProcessingDetailRespVO {
@ExcelProperty("金属元素编码")
@Schema(description = "金属元素编码")
private String elementNumber;
@ExcelProperty("行号")
@Schema(description = "行号")
private Integer lineNumber;
@ExcelProperty("发票类型")
@Schema(description = "发票类型")
private String invoiceType;
@ExcelProperty("物料科目分配组")
@Schema(description = "物料科目分配组")
private String metalAcctasscatGroup;
@Schema(description = "税率")
private BigDecimal taxRte;
}

19
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailSaveReqVO.java
View File

@@ -2,10 +2,15 @@ package com.zt.plat.module.contractorder.controller.admin.originalmaterialproces
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 来料加工订单明细新增/修改 Request VO")
@@ -101,8 +106,22 @@ public class OriginalMaterialProcessingDetailSaveReqVO {
@Schema(description = "金属元素缩写")
private String elementAbbreviation;
@Schema(description = "金属元素名称")
private String elementName;
@Schema(description = "金属元素编码")
private String elementNumber;
@Schema(description = "行号")
private Integer lineNumber;
@Schema(description = "发票类型")
private String invoiceType;
@Schema(description = "物料科目分配组")
private String metalAcctasscatGroup;
@Schema(description = "税率")
private BigDecimal taxRte;
}

15
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingPageReqVO.java
View File

@@ -127,5 +127,20 @@ public class OriginalMaterialProcessingPageReqVO extends PageParam {
@Schema(description = "相关订单ID")
private Long relatedOrderId;
@Schema(description = "销售组织代码")
private String saleOrgzCd;
@Schema(description = "付款方名称")
private String payerName;
@Schema(description = "销售组织名称")
private String saleOrgzName;
@Schema(description = "分销聚道编码")
private String saleAcsCdg;
@Schema(description = "产品组编码")
private String pdtGrpCdg;
@Schema(description = "产品组名称")
private String pdtGrpName;
@Schema(description = "分销聚道名称")
private String saleAcsName;
}

21
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingRespVO.java
View File

@@ -172,5 +172,26 @@ public class OriginalMaterialProcessingRespVO {
//绑定的来料采购订单
@Schema(description = "绑定的来料采购订单")
private OriginalMaterialProcessingRespVO relatedOrder;
@Schema(description = "销售组织代码")
@ExcelProperty("销售组织代码")
private String saleOrgzCd;
@Schema(description = "付款方名称")
@ExcelProperty("付款方名称")
private String payerName;
@Schema(description = "销售组织名称")
@ExcelProperty("销售组织名称")
private String saleOrgzName;
@Schema(description = "分销聚道编码")
@ExcelProperty("分销聚道编码")
private String saleAcsCdg;
@Schema(description = "产品组编码")
@ExcelProperty("产品组编码")
private String pdtGrpCdg;
@Schema(description = "产品组名称")
@ExcelProperty("产品组名称")
private String pdtGrpName;
@Schema(description = "分销聚道名称")
@ExcelProperty("分销聚道名称")
private String saleAcsName;
}

15
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingSaveReqVO.java
View File

@@ -166,4 +166,19 @@ public class OriginalMaterialProcessingSaveReqVO {
@Schema(description = "相关订单ID")
private Long relatedOrderId;
@Schema(description = "销售组织代码")
private String saleOrgzCd;
@Schema(description = "付款方名称")
private String payerName;
@Schema(description = "销售组织名称")
private String saleOrgzName;
@Schema(description = "分销聚道编码")
private String saleAcsCdg;
@Schema(description = "产品组编码")
private String pdtGrpCdg;
@Schema(description = "产品组名称")
private String pdtGrpName;
@Schema(description = "分销聚道名称")
private String saleAcsName;
}

44
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/originalmaterialprocessing/OriginalMaterialProcessingDO.java
View File

@@ -268,4 +268,48 @@ public class OriginalMaterialProcessingDO extends BusinessBaseDO {
*/
@TableField(value = "REL_ORD_ID")
private Long relatedOrderId;
/**
* 付款方名称
*
*/
@TableField("PYER_NAME")
private String payerName;
/**
* 付款方编码
*
*/
@TableField("PYER_NUM")
private String payerNum;
@TableField("SALE_ORGZ_CD")
private String saleOrgzCd;
/**
* 销售组织名称
*
*/
@TableField("SALE_ORGZ_NAME")
private String saleOrgzName;
/**
* 分销聚道编码
*
*/
@TableField("SALE_ACS_CDG")
private String saleAcsCdg;
/**
* 分销聚道名称
*
*/
@TableField("SALE_ACS_NAME")
private String saleAcsName;
/**
* 产品组编码
*
*/
@TableField("PDT_GRP_CDG")
private String pdtGrpCdg;
/**
* 产品组名
*/
@TableField("PDT_GRP_NAME")
private String pdtGrpName;
}

20
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/originalmaterialprocessing/OriginalMaterialProcessingDetailDO.java
View File

@@ -192,5 +192,25 @@ public class OriginalMaterialProcessingDetailDO extends BusinessBaseDO {
*/
@TableField("ELEM_NUM")
private String elementNumber;
/**
* 行号
*/
@TableField("LINE_NUM")
private Integer lineNumber;
/**
* 发票类型
*/
@TableField("INV_TP")
private String invoiceType;
/**
* 物料科目分配组
*/
@TableField("MTL_ACTS_GRP")
private String metalAcctasscatGroup;
/**
* 税率
*/
@TableField("TAX_RTE")
private BigDecimal taxRte;
}

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