[任务2186 涂装导入]

yun-zuoyi
王杰 5 years ago
parent 1f6af14316
commit c2a6fb1684

@ -2,12 +2,14 @@ package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import org.springframework.util.StringUtils;
import javax.persistence.*; import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;
@ -270,7 +272,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam(value = "扩展数据MAP") @ApiParam(value = "扩展数据MAP")
public Map<String, Object> extendMap; public Map<String, Object> extendMap;
@Transient @Transient
@ApiParam("工单源序号") @ApiParam("工单源序号")
private Double srcSeq; private Double srcSeq;
@ -314,4 +315,16 @@ public class MesWorkOrder extends BaseBean implements Serializable {
public int getApprovalStatusVal() { public int getApprovalStatusVal() {
return this.approvalStatus == null ? 0 : this.approvalStatus; return this.approvalStatus == null ? 0 : this.approvalStatus;
} }
public Map<String, Object> getExtendMap() {
try {
if (!StringUtils.isEmpty(this.extend)) {
return JSONObject.parseObject(this.extend, Map.class);
} else {
return null;
}
} catch (Exception e) {
return null;
}
}
} }

Loading…
Cancel
Save