|
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
|
import com.qmth.sop.common.base.BaseEntity;
|
|
import com.qmth.sop.common.base.BaseEntity;
|
|
import com.qmth.sop.common.enums.DeviceDeliveryStatusEnum;
|
|
import com.qmth.sop.common.enums.DeviceDeliveryStatusEnum;
|
|
import com.qmth.sop.common.enums.DeviceUsageTypeEnum;
|
|
import com.qmth.sop.common.enums.DeviceUsageTypeEnum;
|
|
|
|
+import com.qmth.sop.common.enums.InOutTypeEnum;
|
|
import io.swagger.annotations.ApiModel;
|
|
import io.swagger.annotations.ApiModel;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
|
|
|
|
@@ -61,6 +62,9 @@ public class TBDeviceDelivery extends BaseEntity implements Serializable {
|
|
@ApiModelProperty(value = "快递单拍照")
|
|
@ApiModelProperty(value = "快递单拍照")
|
|
private String expressPhotoPath;
|
|
private String expressPhotoPath;
|
|
|
|
|
|
|
|
+ @ApiModelProperty(value = "发货类型(出入库类型)")
|
|
|
|
+ private InOutTypeEnum deliveryType;
|
|
|
|
+
|
|
@ApiModelProperty(value = "状态,UN_DELIVER:待发货,DELIVER:已发货,RECEIVE:已签收,CANCEL:作废")
|
|
@ApiModelProperty(value = "状态,UN_DELIVER:待发货,DELIVER:已发货,RECEIVE:已签收,CANCEL:作废")
|
|
private DeviceDeliveryStatusEnum status;
|
|
private DeviceDeliveryStatusEnum status;
|
|
|
|
|
|
@@ -81,6 +85,9 @@ public class TBDeviceDelivery extends BaseEntity implements Serializable {
|
|
@ApiModelProperty(value = "是否启用,0:停用,1:启用")
|
|
@ApiModelProperty(value = "是否启用,0:停用,1:启用")
|
|
private Boolean enable;
|
|
private Boolean enable;
|
|
|
|
|
|
|
|
+ @ApiModelProperty(value = "有效的可操作的发货记录(当一个设备处于一个发货出入库生命周期时为有效), 0: 无效,1: 有效")
|
|
|
|
+ private Boolean effect;
|
|
|
|
+
|
|
public String getExpressNo() {
|
|
public String getExpressNo() {
|
|
return expressNo;
|
|
return expressNo;
|
|
}
|
|
}
|
|
@@ -224,4 +231,20 @@ public class TBDeviceDelivery extends BaseEntity implements Serializable {
|
|
public void setEnable(Boolean enable) {
|
|
public void setEnable(Boolean enable) {
|
|
this.enable = enable;
|
|
this.enable = enable;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ public InOutTypeEnum getDeliveryType() {
|
|
|
|
+ return deliveryType;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setDeliveryType(InOutTypeEnum deliveryType) {
|
|
|
|
+ this.deliveryType = deliveryType;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public Boolean getEffect() {
|
|
|
|
+ return effect;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setEffect(Boolean effect) {
|
|
|
|
+ this.effect = effect;
|
|
|
|
+ }
|
|
}
|
|
}
|