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

委托加工添加发货工厂字段和明细添加金属元素字段

Browse Source
This commit is contained in:
潘荣晟
2026-02-10 11:02:25 +08:00
parent 356e330c7c
commit 7f698802b1
21 changed files with 764 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderPageReqVO.java
View File

@@ -140,5 +140,7 @@ public class EntrustOrderOrderPageReqVO extends PageParam {
private String sendWarehouseNumber;
@Schema(description = "物权转移", example = "张三")
private String meteringType;
@Schema(description = "订单类型，(字典：SPLY_BSN_TP)")
private String splyBsnTp;
}

4
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderRespVO.java
View File

@@ -189,4 +189,8 @@ public class EntrustOrderOrderRespVO {
private String sendWarehouseNumber;
@Schema(description = "物权转移", example = "张三")
private String meteringType;
@ExcelProperty("订单类型")
@Schema(description = "订单类型，(字典：SPLY_BSN_TP)")
private String splyBsnTp;
}

3
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java
View File

@@ -161,4 +161,7 @@ public class EntrustOrderOrderSaveReqVO {
private String sendWarehouseNumber;
@Schema(description = "物权转移", example = "张三")
private String meteringType;
@Schema(description = "订单类型，(字典：SPLY_BSN_TP)")
private String splyBsnTp;
}

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

File diff suppressed because it is too large Load Diff

13
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

@@ -1,5 +1,6 @@
package com.zt.plat.module.contractorder.controller.admin.originalmaterialprocessing.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -48,7 +49,7 @@ public class OriginalMaterialProcessingDetailPageReqVO extends PageParam {
private String materialNumber;
@Schema(description = "计量单位")
private String uom;
private String unit;
@Schema(description = "暂估数量")
private BigDecimal forecastQuantity;
@@ -104,4 +105,14 @@ public class OriginalMaterialProcessingDetailPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "金属元素缩写")
private String elementAbbreviation;
@Schema(description = "金属元素名称")
private String elementName;
@Schema(description = "金属元素编码")
private String elementNumber;
}

15
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

@@ -63,7 +63,7 @@ public class OriginalMaterialProcessingDetailRespVO {
@Schema(description = "计量单位")
@ExcelProperty("计量单位")
private String uom;
private String unit;
@Schema(description = "暂估数量")
@ExcelProperty("暂估数量")
@@ -133,4 +133,17 @@ public class OriginalMaterialProcessingDetailRespVO {
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "删除标识")
@ExcelProperty("删除标识")
private Boolean deleted;
@ExcelProperty("金属元素缩写")
@Schema(description = "金属元素缩写")
private String elementAbbreviation;
@ExcelProperty("金属元素名称")
@Schema(description = "金属元素名称")
private String elementName;
@ExcelProperty("金属元素编码")
@Schema(description = "金属元素编码")
private String elementNumber;
}

8
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

@@ -49,7 +49,7 @@ public class OriginalMaterialProcessingDetailSaveReqVO {
private String materialNumber;
@Schema(description = "计量单位")
private String uom;
private String unit;
@Schema(description = "暂估数量")
private BigDecimal forecastQuantity;
@@ -99,4 +99,10 @@ public class OriginalMaterialProcessingDetailSaveReqVO {
@Schema(description = "价格条件")
private String priceCondition;
@Schema(description = "金属元素缩写")
private String elementAbbreviation;
@Schema(description = "金属元素名称")
private String elementName;
@Schema(description = "金属元素编码")
private String elementNumber;
}

5
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

@@ -121,5 +121,10 @@ public class OriginalMaterialProcessingPageReqVO extends PageParam {
@Schema(description = "采购组名称", example = "张三")
private String purchaseGroupName;
@Schema(description = "订单类型，(字典：SPLY_BSN_TP)")
private String splyBsnTp;
@Schema(description = "相关订单ID")
private Long relatedOrderId;
}

9
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

@@ -158,7 +158,14 @@ public class OriginalMaterialProcessingRespVO {
@Schema(description = "采购组名称", example = "张三")
@ExcelProperty("采购组名称")
private String purchaseGroupName;
@Schema(description = "订单明细")
private List<OriginalMaterialProcessingDetailRespVO> details;
@ExcelProperty("业务类型(字典：SPLY_BSN_TP)")
@Schema(description = "订单类型，(字典：SPLY_BSN_TP)")
private String splyBsnTp;
@Schema(description = "相关订单ID")
@ExcelProperty("相关订单ID")
private Long relatedOrderId;
}

26
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

@@ -1,5 +1,6 @@
package com.zt.plat.module.contractorder.controller.admin.originalmaterialprocessing.vo;
import com.zt.plat.module.contractorder.controller.admin.entrustorder.vo.EntrustOrderDetailSaveReqVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -20,10 +21,12 @@ public class OriginalMaterialProcessingSaveReqVO {
// @NotEmpty(message = "订单号不能为空")
private String systemOrderNumber;
@Schema(description = "公司编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
//@NotEmpty(message = "公司编码;推送ERP（必须）不能为空")
@Schema(description = "公司名称;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
private String cpName;
@Schema(description = "公司编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
private String cpNum;
@Schema(description = "客商编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
//@NotEmpty(message = "客商编码;推送ERP（必须）不能为空")
private String supplierNumber;
@@ -140,7 +143,26 @@ public class OriginalMaterialProcessingSaveReqVO {
@Schema(description = "创建时间")
private LocalDateTime createTime;
@Schema(description = "计量单位", example = "张三")
private String unit;
@Schema(description = "物料类型", example = "张三")
private String mtrlTp;
@Schema(description = "发货工厂名称", example = "张三")
private String sendFactoryName;
@Schema(description = "发货工厂编码", example = "张三")
private String sendFactoryNumber;
@Schema(description = "发货库位名称", example = "张三")
private String sendWarehouseName;
@Schema(description = "发货库位编码", example = "张三")
private String sendWarehouseNumber;
@Schema(description = "物权转移", example = "张三")
private String meteringType;
@Schema(description = "来料加工订单明细")
private List<OriginalMaterialProcessingDetailSaveReqVO> details;
@Schema(description = "订单类型，(字典：SPLY_BSN_TP)")
private String splyBsnTp;
@Schema(description = "相关订单ID")
private Long relatedOrderId;
}

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