diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java index 99228324..b6f8c097 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java @@ -5,6 +5,7 @@ import lombok.*; import jakarta.validation.constraints.*; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; @Schema(description = "管理后台 - 采购订单新增/修改 Request VO") @Data @@ -17,62 +18,62 @@ public class EntrustOrderOrderSaveReqVO { private String orderSAPNumber; @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "订单号不能为空") + // @NotEmpty(message = "订单号不能为空") private String systemOrderNumber; @Schema(description = "公司编码;推送ERP(必须)", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "公司编码;推送ERP(必须)不能为空") + //@NotEmpty(message = "公司编码;推送ERP(必须)不能为空") private String companyNumber; @Schema(description = "客商编码;推送ERP(必须)", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "客商编码;推送ERP(必须)不能为空") + //@NotEmpty(message = "客商编码;推送ERP(必须)不能为空") private String supplierNumber; @Schema(description = "客商名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") - @NotEmpty(message = "客商名称不能为空") + // @NotEmpty(message = "客商名称不能为空") private String supplierName; @Schema(description = "订单类型(字典:PRCH_ORD_TP);推送ERP(必须)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotEmpty(message = "订单类型(字典:PRCH_ORD_TP);推送ERP(必须)不能为空") + // @NotEmpty(message = "订单类型(字典:PRCH_ORD_TP);推送ERP(必须)不能为空") private String type; @Schema(description = "凭证日期;推送ERP(必须)", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "凭证日期;推送ERP(必须)不能为空") + //@NotNull(message = "凭证日期;推送ERP(必须)不能为空") private LocalDateTime voucherDate; @Schema(description = "采购组织编码;推送ERP(必须)", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "采购组织编码;推送ERP(必须)不能为空") + // @NotEmpty(message = "采购组织编码;推送ERP(必须)不能为空") private String purchaseOrganizationCustomsDeclaration; @Schema(description = "收货工厂名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") - @NotEmpty(message = "收货工厂名称不能为空") + // @NotEmpty(message = "收货工厂名称不能为空") private String receiveFactoryName; @Schema(description = "收货工厂编码;推送ERP(必须)", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "收货工厂编码;推送ERP(必须)不能为空") + //@NotEmpty(message = "收货工厂编码;推送ERP(必须)不能为空") private String receiveFactoryNumber; @Schema(description = "收货库位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") - @NotEmpty(message = "收货库位名称不能为空") + // @NotEmpty(message = "收货库位名称不能为空") private String receiveWarehouseName; @Schema(description = "收货库位编码;推送ERP", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "收货库位编码;推送ERP不能为空") + //@NotEmpty(message = "收货库位编码;推送ERP不能为空") private String receiveWarehouseNumber; @Schema(description = "采购组编码(字典:PRCH_GRP_TP);推送ERP(必须)", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "采购组编码(字典:PRCH_GRP_TP);推送ERP(必须)不能为空") + //@NotEmpty(message = "采购组编码(字典:PRCH_GRP_TP);推送ERP(必须)不能为空") private String purchaseGroup; @Schema(description = "货币码(字典:CUR);推送ERP(必须)", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "货币码(字典:CUR);推送ERP(必须)不能为空") + //@NotEmpty(message = "货币码(字典:CUR);推送ERP(必须)不能为空") private String currencyNumber; @Schema(description = "汇率;推送ERP") private BigDecimal exchangeRate; @Schema(description = "合同纸质合同号;推送ERP(必须)", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "合同纸质合同号;推送ERP(必须)不能为空") + // @NotEmpty(message = "合同纸质合同号;推送ERP(必须)不能为空") private String paperContractNumber; @Schema(description = "小协议号;推送ERP") @@ -88,11 +89,11 @@ public class EntrustOrderOrderSaveReqVO { private String agentName; @Schema(description = "订单编码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "订单编码不能为空") + //@NotEmpty(message = "订单编码不能为空") private String orderNumber; @Schema(description = "系统合同编号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "系统合同编号不能为空") + // @NotEmpty(message = "系统合同编号不能为空") private String contractNumber; @Schema(description = "物料编码") @@ -108,19 +109,19 @@ public class EntrustOrderOrderSaveReqVO { private String tenantNumber; @Schema(description = "ERP公司编号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "ERP公司编号不能为空") + //@NotEmpty(message = "ERP公司编号不能为空") private String erpPurchaseCompanyNumber; @Schema(description = "ERP公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") - @NotEmpty(message = "ERP公司名称不能为空") + // @NotEmpty(message = "ERP公司名称不能为空") private String erpPurchaseCompanyName; @Schema(description = "ERP客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "ERP客商公司编码不能为空") + // @NotEmpty(message = "ERP客商公司编码不能为空") private String erpSalesCompanyNumber; @Schema(description = "ERP客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") - @NotEmpty(message = "ERP客商公司名称不能为空") + //@NotEmpty(message = "ERP客商公司名称不能为空") private String erpSalesCompanyName; @Schema(description = "采购组织名称", example = "赵六") @@ -140,4 +141,7 @@ public class EntrustOrderOrderSaveReqVO { @Schema(description = "创建时间") private LocalDateTime[] createTime; + @Schema(description = "委托加工订单明细") + private List entrustOrderDetails; + } \ No newline at end of file