Commit 3705bf278c690a67acbfda4968d5b1f287826347

Authored by 2c2c2c
1 parent 9694e9d1

电子联单bug 修复,导出联单,打印联单

trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
@@ -134,12 +134,6 @@ public class GarOrderMatchAsk implements Serializable { @@ -134,12 +134,6 @@ public class GarOrderMatchAsk implements Serializable {
134 private Date garUpdateTime; 134 private Date garUpdateTime;
135 135
136 /** 136 /**
137 - * 接收量  
138 - */  
139 -// @Excel(name = "接收量")  
140 - private Double garReceptionQuantity;  
141 -  
142 - /**  
143 * 137 *
144 */ 138 */
145 @TableField(fill = FieldFill.INSERT) 139 @TableField(fill = FieldFill.INSERT)
@@ -397,14 +391,6 @@ public class GarOrderMatchAsk implements Serializable { @@ -397,14 +391,6 @@ public class GarOrderMatchAsk implements Serializable {
397 this.garCarryingWeight = garCarryingWeight; 391 this.garCarryingWeight = garCarryingWeight;
398 } 392 }
399 393
400 - public Double getGarReceptionQuantity() {  
401 - return garReceptionQuantity;  
402 - }  
403 -  
404 - public void setGarReceptionQuantity(Double garReceptionQuantity) {  
405 - this.garReceptionQuantity = garReceptionQuantity;  
406 - }  
407 -  
408 public int getDropPointId() { 394 public int getDropPointId() {
409 return dropPointId; 395 return dropPointId;
410 } 396 }
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/AskTransportDto.java
@@ -20,8 +20,6 @@ public class AskTransportDto { @@ -20,8 +20,6 @@ public class AskTransportDto {
20 private String garOrderHandlerId; 20 private String garOrderHandlerId;
21 @NotNull(message = "车辆载重不能为空") 21 @NotNull(message = "车辆载重不能为空")
22 private Double garCarryingWeight; 22 private Double garCarryingWeight;
23 - @NotNull(message = "接收量不能为空")  
24 - private Double garReceptionQuantity;  
25 @NotBlank(message = "垃圾类型不能为空") 23 @NotBlank(message = "垃圾类型不能为空")
26 private String garOrderTrashType; 24 private String garOrderTrashType;
27 @NotBlank(message = "车牌号不能为空") 25 @NotBlank(message = "车牌号不能为空")
@@ -155,12 +153,4 @@ public class AskTransportDto { @@ -155,12 +153,4 @@ public class AskTransportDto {
155 public void setGarOrderContainerVolume(String garOrderContainerVolume) { 153 public void setGarOrderContainerVolume(String garOrderContainerVolume) {
156 this.garOrderContainerVolume = garOrderContainerVolume; 154 this.garOrderContainerVolume = garOrderContainerVolume;
157 } 155 }
158 -  
159 - public Double getGarReceptionQuantity() {  
160 - return garReceptionQuantity;  
161 - }  
162 -  
163 - public void setGarReceptionQuantity(Double garReceptionQuantity) {  
164 - this.garReceptionQuantity = garReceptionQuantity;  
165 - }  
166 } 156 }