|
@@ -10,6 +10,7 @@ import com.qmth.sop.common.enums.InOutTypeEnum;
|
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
|
|
|
|
import java.io.Serializable;
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
/**
|
|
|
* @Description: 设备发货管理result
|
|
@@ -152,7 +153,12 @@ public class TBDeviceDeliveryResult implements Serializable {
|
|
|
}
|
|
|
|
|
|
public String getDeliveryTypeStr() {
|
|
|
- return deliveryTypeStr;
|
|
|
+ if (Objects.nonNull(deliveryType)) {
|
|
|
+ String[] strs = deliveryType.getTitle().split("|");
|
|
|
+ return strs[0];
|
|
|
+ } else {
|
|
|
+ return deliveryTypeStr;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
public void setDeliveryTypeStr(String deliveryTypeStr) {
|