朱园亮 / xingyun-erp · Commits

Commit e851a0821fe87b40090f8beecd9ac0c3ec17fda6

Authored by 杨鸣坤
1 parent 8e2c253a

楚江ERP：去除部分必填校验

Inline Side-by-side
Showing 2 changed files with 35 additions and 70 deletions
@@ -34,32 +34,28 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable { @@ -34,32 +34,28 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
34 /** 34 /**
35 * 行业 35 * 行业
36 */ 36 */
37 - @ApiModelProperty(value = "行业", required = true)  
38 - @NotBlank(message = "请输入行业！") 37 + @ApiModelProperty(value = "行业")
39 @Length(message = "行业最多允许100个字符！") 38 @Length(message = "行业最多允许100个字符！")
40 private String industry; 39 private String industry;
41 40
42 /** 41 /**
43 * 品质 42 * 品质
44 */ 43 */
45 - @ApiModelProperty(value = "品质", required = true)  
46 - @NotBlank(message = "请输入品质！") 44 + @ApiModelProperty(value = "品质")
47 @Length(message = "品质最多允许100个字符！") 45 @Length(message = "品质最多允许100个字符！")
48 private String quality; 46 private String quality;
49 47
50 /** 48 /**
51 * 牌号 49 * 牌号
52 */ 50 */
53 - @ApiModelProperty(value = "牌号", required = true)  
54 - @NotBlank(message = "请输入牌号！") 51 + @ApiModelProperty(value = "牌号")
55 @Length(message = "牌号最多允许100个字符！") 52 @Length(message = "牌号最多允许100个字符！")
56 private String brand; 53 private String brand;
57 54
58 /** 55 /**
59 * 厚度 56 * 厚度
60 */ 57 */
61 - @ApiModelProperty(value = "厚度", required = true)  
62 - @NotNull(message = "请输入厚度！") 58 + @ApiModelProperty(value = "厚度")
63 @TypeMismatch(message = "厚度格式有误！") 59 @TypeMismatch(message = "厚度格式有误！")
64 @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4) 60 @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4)
65 private BigDecimal thickness; 61 private BigDecimal thickness;
@@ -67,8 +63,7 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable { @@ -67,8 +63,7 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
67 /** 63 /**
68 * 宽度 64 * 宽度
69 */ 65 */
70 - @ApiModelProperty(value = "宽度", required = true)  
71 - @NotNull(message = "请输入宽度！") 66 + @ApiModelProperty(value = "宽度")
72 @TypeMismatch(message = "宽度格式有误！") 67 @TypeMismatch(message = "宽度格式有误！")
73 @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4) 68 @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4)
74 private BigDecimal width; 69 private BigDecimal width;
@@ -76,8 +71,7 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable { @@ -76,8 +71,7 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
76 /** 71 /**
77 * 长度 72 * 长度
78 */ 73 */
79 - @ApiModelProperty(value = "长度", required = true)  
80 - @NotNull(message = "请输入长度！") 74 + @ApiModelProperty(value = "长度")
81 @TypeMismatch(message = "长度格式有误！") 75 @TypeMismatch(message = "长度格式有误！")
82 @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4) 76 @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4)
83 private BigDecimal length; 77 private BigDecimal length;
@@ -85,16 +79,14 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable { @@ -85,16 +79,14 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
85 /** 79 /**
86 * 状态 80 * 状态
87 */ 81 */
88 - @ApiModelProperty(value = "状态", required = true)  
89 - @NotBlank(message = "请输入状态！") 82 + @ApiModelProperty(value = "状态")
90 @Length(message = "状态最多允许50个字符！") 83 @Length(message = "状态最多允许50个字符！")
91 private String status; 84 private String status;
92 85
93 /** 86 /**
94 * 数量 87 * 数量
95 */ 88 */
96 - @ApiModelProperty(value = "数量", required = true)  
97 - @NotNull(message = "请输入数量！") 89 + @ApiModelProperty(value = "数量")
98 @TypeMismatch(message = "数量格式有误！") 90 @TypeMismatch(message = "数量格式有误！")
99 @IsNumberPrecision(message = "数量最多允许4位小数！", value = 4) 91 @IsNumberPrecision(message = "数量最多允许4位小数！", value = 4)
100 private BigDecimal quantity; 92 private BigDecimal quantity;
@@ -102,8 +94,7 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable { @@ -102,8 +94,7 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
102 /** 94 /**
103 * 单价 95 * 单价
104 */ 96 */
105 - @ApiModelProperty(value = "单价", required = true)  
106 - @NotNull(message = "请输入单价！") 97 + @ApiModelProperty(value = "单价")
107 @TypeMismatch(message = "单价格式有误！") 98 @TypeMismatch(message = "单价格式有误！")
108 @IsNumberPrecision(message = "单价最多允许4位小数！", value = 4) 99 @IsNumberPrecision(message = "单价最多允许4位小数！", value = 4)
109 private BigDecimal unitPrice; 100 private BigDecimal unitPrice;
@@ -111,8 +102,7 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable { @@ -111,8 +102,7 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
111 /** 102 /**
112 * 不含税金额 103 * 不含税金额
113 */ 104 */
114 - @ApiModelProperty(value = "不含税金额", required = true)  
115 - @NotNull(message = "请输入不含税金额！") 105 + @ApiModelProperty(value = "不含税金额")
116 @TypeMismatch(message = "不含税金额格式有误！") 106 @TypeMismatch(message = "不含税金额格式有误！")
117 @IsNumberPrecision(message = "不含税金额最多允许2位小数！", value = 2) 107 @IsNumberPrecision(message = "不含税金额最多允许2位小数！", value = 2)
118 private BigDecimal amountExcludingTax; 108 private BigDecimal amountExcludingTax;
@@ -120,8 +110,7 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable { @@ -120,8 +110,7 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
120 /** 110 /**
121 * 总金额 111 * 总金额
122 */ 112 */
123 - @ApiModelProperty(value = "总金额", required = true)  
124 - @NotNull(message = "请输入总金额！") 113 + @ApiModelProperty(value = "总金额")
125 @TypeMismatch(message = "总金额格式有误！") 114 @TypeMismatch(message = "总金额格式有误！")
126 @IsNumberPrecision(message = "总金额最多允许2位小数！", value = 2) 115 @IsNumberPrecision(message = "总金额最多允许2位小数！", value = 2)
127 private BigDecimal totalAmount; 116 private BigDecimal totalAmount;
@@ -129,16 +118,14 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable { @@ -129,16 +118,14 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
129 /** 118 /**
130 * 发货日期 119 * 发货日期
131 */ 120 */
132 - @ApiModelProperty(value = "发货日期", required = true)  
133 - @NotNull(message = "请输入发货日期！") 121 + @ApiModelProperty(value = "发货日期")
134 @TypeMismatch(message = "发货日期格式有误！") 122 @TypeMismatch(message = "发货日期格式有误！")
135 private LocalDate deliveryDate; 123 private LocalDate deliveryDate;
136 124
137 /** 125 /**
138 * 排序 126 * 排序
139 */ 127 */
140 - @ApiModelProperty(value = "排序", required = true)  
141 - @NotNull(message = "请输入排序！") 128 + @ApiModelProperty(value = "排序")
142 @TypeMismatch(message = "排序格式有误！") 129 @TypeMismatch(message = "排序格式有误！")
143 private Integer showOrder; 130 private Integer showOrder;
144 131
@@ -152,48 +139,42 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable { @@ -152,48 +139,42 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
152 /** 139 /**
153 * 厚度公差正 140 * 厚度公差正
154 */ 141 */
155 - @ApiModelProperty(value = "厚度公差正", required = true)  
156 - @NotNull(message = "请输入厚度公差正！") 142 + @ApiModelProperty(value = "厚度公差正")
157 @TypeMismatch(message = "厚度公差正格式有误！") 143 @TypeMismatch(message = "厚度公差正格式有误！")
158 private BigDecimal thicknessTolPos; 144 private BigDecimal thicknessTolPos;
159 145
160 /** 146 /**
161 * 厚度公差负 147 * 厚度公差负
162 */ 148 */
163 - @ApiModelProperty(value = "厚度公差负", required = true)  
164 - @NotNull(message = "请输入厚度公差负！") 149 + @ApiModelProperty(value = "厚度公差负")
165 @TypeMismatch(message = "厚度公差负格式有误！") 150 @TypeMismatch(message = "厚度公差负格式有误！")
166 private BigDecimal thicknessTolNeg; 151 private BigDecimal thicknessTolNeg;
167 152
168 /** 153 /**
169 * 宽度公差正 154 * 宽度公差正
170 */ 155 */
171 - @ApiModelProperty(value = "宽度公差正", required = true)  
172 - @NotNull(message = "请输入宽度公差正！") 156 + @ApiModelProperty(value = "宽度公差正")
173 @TypeMismatch(message = "宽度公差正格式有误！") 157 @TypeMismatch(message = "宽度公差正格式有误！")
174 private BigDecimal widthTolPos; 158 private BigDecimal widthTolPos;
175 159
176 /** 160 /**
177 * 宽度公差负 161 * 宽度公差负
178 */ 162 */
179 - @ApiModelProperty(value = "宽度公差负", required = true)  
180 - @NotNull(message = "请输入宽度公差负！") 163 + @ApiModelProperty(value = "宽度公差负")
181 @TypeMismatch(message = "宽度公差负格式有误！") 164 @TypeMismatch(message = "宽度公差负格式有误！")
182 private BigDecimal widthTolNeg; 165 private BigDecimal widthTolNeg;
183 166
184 /** 167 /**
185 * 长度公差正 168 * 长度公差正
186 */ 169 */
187 - @ApiModelProperty(value = "长度公差正", required = true)  
188 - @NotNull(message = "请输入长度公差正！") 170 + @ApiModelProperty(value = "长度公差正")
189 @TypeMismatch(message = "长度公差正格式有误！") 171 @TypeMismatch(message = "长度公差正格式有误！")
190 private BigDecimal lengthTolPos; 172 private BigDecimal lengthTolPos;
191 173
192 /** 174 /**
193 * 长度公差负 175 * 长度公差负
194 */ 176 */
195 - @ApiModelProperty(value = "长度公差负", required = true)  
196 - @NotNull(message = "请输入长度公差负！") 177 + @ApiModelProperty(value = "长度公差负")
197 @TypeMismatch(message = "长度公差负格式有误！") 178 @TypeMismatch(message = "长度公差负格式有误！")
198 private BigDecimal lengthTolNeg; 179 private BigDecimal lengthTolNeg;
199 180
@@ -86,24 +86,21 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable @@ -86,24 +86,21 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
86 /** 86 /**
87 * 包装要求 87 * 包装要求
88 */ 88 */
89 - @ApiModelProperty(value = "包装要求", required = true)  
90 - @NotBlank(message = "请输入包装要求！") 89 + @ApiModelProperty(value = "包装要求")
91 @Length(message = "包装要求最多允许200个字符！") 90 @Length(message = "包装要求最多允许200个字符！")
92 private String packagingRequirements; 91 private String packagingRequirements;
93 92
94 /** 93 /**
95 * 付款信息（包含付款方式、付款期限） 94 * 付款信息（包含付款方式、付款期限）
96 */ 95 */
97 - @ApiModelProperty(value = "付款信息（包含付款方式、付款期限）", required = true)  
98 - @NotBlank(message = "请输入付款信息（包含付款方式、付款期限）！") 96 + @ApiModelProperty(value = "付款信息（包含付款方式、付款期限）")
99 @Length(message = "付款信息（包含付款方式、付款期限）最多允许500个字符！") 97 @Length(message = "付款信息（包含付款方式、付款期限）最多允许500个字符！")
100 private String paymentTerms; 98 private String paymentTerms;
101 99
102 /** 100 /**
103 * 执行标准 101 * 执行标准
104 */ 102 */
105 - @ApiModelProperty(value = "执行标准", required = true)  
106 - @NotBlank(message = "请输入执行标准！") 103 + @ApiModelProperty(value = "执行标准")
107 @Length(message = "执行标准最多允许50个字符！") 104 @Length(message = "执行标准最多允许50个字符！")
108 private String executionStandard; 105 private String executionStandard;
109 106
@@ -117,104 +114,91 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable @@ -117,104 +114,91 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
117 /** 114 /**
118 * 运输方式 115 * 运输方式
119 */ 116 */
120 - @ApiModelProperty(value = "运输方式", required = true)  
121 - @NotBlank(message = "请输入运输方式！") 117 + @ApiModelProperty(value = "运输方式")
122 @Length(message = "运输方式最多允许100个字符！") 118 @Length(message = "运输方式最多允许100个字符！")
123 private String transportMode; 119 private String transportMode;
124 120
125 /** 121 /**
126 * 目的地 122 * 目的地
127 */ 123 */
128 - @ApiModelProperty(value = "目的地", required = true)  
129 - @NotBlank(message = "请输入目的地！") 124 + @ApiModelProperty(value = "目的地")
130 @Length(message = "目的地最多允许200个字符！") 125 @Length(message = "目的地最多允许200个字符！")
131 private String destination; 126 private String destination;
132 127
133 /** 128 /**
134 * 单价中是否已包含包装费 129 * 单价中是否已包含包装费
135 */ 130 */
136 - @ApiModelProperty(value = "单价中是否已包含包装费", required = true)  
137 - @NotNull(message = "请输入单价中是否已包含包装费！") 131 + @ApiModelProperty(value = "单价中是否已包含包装费")
138 @TypeMismatch(message = "单价中是否已包含包装费格式有误！") 132 @TypeMismatch(message = "单价中是否已包含包装费格式有误！")
139 private Boolean includesPackagingFee; 133 private Boolean includesPackagingFee;
140 134
141 /** 135 /**
142 * 单价中是否已包含运费 136 * 单价中是否已包含运费
143 */ 137 */
144 - @ApiModelProperty(value = "单价中是否已包含运费", required = true)  
145 - @NotNull(message = "请输入单价中是否已包含运费！") 138 + @ApiModelProperty(value = "单价中是否已包含运费")
146 @TypeMismatch(message = "单价中是否已包含运费格式有误！") 139 @TypeMismatch(message = "单价中是否已包含运费格式有误！")
147 private Boolean includesTransportFee; 140 private Boolean includesTransportFee;
148 141
149 /** 142 /**
150 * 件重条头 143 * 件重条头
151 */ 144 */
152 - @ApiModelProperty(value = "件重条头", required = true)  
153 - @NotBlank(message = "请输入件重条头！") 145 + @ApiModelProperty(value = "件重条头")
154 @Length(message = "件重条头最多允许65,535个字符！") 146 @Length(message = "件重条头最多允许65,535个字符！")
155 private String pieceWeightHead; 147 private String pieceWeightHead;
156 148
157 /** 149 /**
158 * 表面 150 * 表面
159 */ 151 */
160 - @ApiModelProperty(value = "表面", required = true)  
161 - @NotBlank(message = "请输入表面！") 152 + @ApiModelProperty(value = "表面")
162 @Length(message = "表面最多允许65,535个字符！") 153 @Length(message = "表面最多允许65,535个字符！")
163 private String surface; 154 private String surface;
164 155
165 /** 156 /**
166 * 公差 157 * 公差
167 */ 158 */
168 - @ApiModelProperty(value = "公差", required = true)  
169 - @NotBlank(message = "请输入公差！") 159 + @ApiModelProperty(value = "公差")
170 @Length(message = "公差最多允许65,535个字符！") 160 @Length(message = "公差最多允许65,535个字符！")
171 private String tolerance; 161 private String tolerance;
172 162
173 /** 163 /**
174 * 性能 164 * 性能
175 */ 165 */
176 - @ApiModelProperty(value = "性能", required = true)  
177 - @NotBlank(message = "请输入性能！") 166 + @ApiModelProperty(value = "性能")
178 @Length(message = "性能最多允许65,535个字符！") 167 @Length(message = "性能最多允许65,535个字符！")
179 private String performance; 168 private String performance;
180 169
181 /** 170 /**
182 * 包装 171 * 包装
183 */ 172 */
184 - @ApiModelProperty(value = "包装", required = true)  
185 - @NotBlank(message = "请输入包装！") 173 + @ApiModelProperty(value = "包装")
186 @Length(message = "包装最多允许65,535个字符！") 174 @Length(message = "包装最多允许65,535个字符！")
187 private String packaging; 175 private String packaging;
188 176
189 /** 177 /**
190 * 特别条款要求 178 * 特别条款要求
191 */ 179 */
192 - @ApiModelProperty(value = "特别条款要求", required = true)  
193 - @NotBlank(message = "请输入特别条款要求！") 180 + @ApiModelProperty(value = "特别条款要求")
194 @Length(message = "特别条款要求最多允许50个字符！") 181 @Length(message = "特别条款要求最多允许50个字符！")
195 private String specialTerms; 182 private String specialTerms;
196 183
197 /** 184 /**
198 * 需方指定收货人 185 * 需方指定收货人
199 */ 186 */
200 - @ApiModelProperty(value = "需方指定收货人", required = true)  
201 - @NotBlank(message = "请输入需方指定收货人！") 187 + @ApiModelProperty(value = "需方指定收货人")
202 @Length(message = "需方指定收货人最多允许65,535个字符！") 188 @Length(message = "需方指定收货人最多允许65,535个字符！")
203 private String designatedConsignee; 189 private String designatedConsignee;
204 190
205 /** 191 /**
206 * 特别说明 192 * 特别说明
207 */ 193 */
208 - @ApiModelProperty(value = "特别说明", required = true)  
209 - @NotBlank(message = "请输入特别说明！") 194 + @ApiModelProperty(value = "特别说明")
210 @Length(message = "特别说明最多允许65,535个字符！") 195 @Length(message = "特别说明最多允许65,535个字符！")
211 private String specialInstructions; 196 private String specialInstructions;
212 197
213 /** 198 /**
214 * 备注 199 * 备注
215 */ 200 */
216 - @ApiModelProperty(value = "备注", required = true)  
217 - @NotBlank(message = "请输入备注！") 201 + @ApiModelProperty(value = "备注")
218 @Length(message = "备注最多允许65,535个字符！") 202 @Length(message = "备注最多允许65,535个字符！")
219 private String remarks; 203 private String remarks;
220 204