冲突解决
wynne1005
5 years ago
commit
8c0ea0d52f
@ -0,0 +1,45 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class DismantleRecordModel {
|
||||
|
||||
@ApiParam("组织代码")
|
||||
private String organizeCode;
|
||||
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam("工单号")
|
||||
private String workOrderNo;
|
||||
|
||||
@ApiParam("过程条码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@ApiParam("缺陷类型")
|
||||
private String defectType;
|
||||
|
||||
@ApiParam("用户")
|
||||
private String userInfo;
|
||||
|
||||
@ApiParam("物料拆解集合")
|
||||
private List<MesDismantleRecord> dismantleRecordList;
|
||||
|
||||
@ApiParam("不良集合")
|
||||
private List<MesDefect> defectList;
|
||||
}
|
||||
@ -0,0 +1,102 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2020/3/20 9:02 下午
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
@Api("JIT队列列表Model")
|
||||
public class QueueJitActualModel {
|
||||
|
||||
private Long id;
|
||||
@ApiParam("vin")
|
||||
private String vinCode;
|
||||
@ApiParam("排序号")
|
||||
private Double seq;
|
||||
@ApiParam("分组队列编号")
|
||||
private String queueGroupNo;
|
||||
@ApiParam("组内编号")
|
||||
private Integer groupNo;
|
||||
@ApiParam("JIT排序号")
|
||||
private String jitSeq;
|
||||
|
||||
@ApiParam("队列编号")
|
||||
private String jisActualNo;
|
||||
|
||||
@ApiParam("工单类型")
|
||||
public Integer workType;
|
||||
|
||||
@ApiParam("工单类型")
|
||||
public String workTypeName;
|
||||
|
||||
@ApiParam("客户产线代码")
|
||||
private String custProdLineCode;
|
||||
|
||||
@ApiParam("产品位置代码")
|
||||
private String produceCtgyCode;
|
||||
|
||||
@ApiParam("产品条码")
|
||||
private String productSn;
|
||||
|
||||
@ApiParam("明细状态名称")
|
||||
private Integer detailStatus;
|
||||
|
||||
@ApiParam("明细状态名称")
|
||||
private String detailStatusName;
|
||||
|
||||
@ApiParam("创建人")
|
||||
private String createUser;
|
||||
|
||||
@ApiParam("创建时间")
|
||||
private String createDatetime;
|
||||
|
||||
@ApiParam("产品条码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam("用量")
|
||||
private Double qty = 0d;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partName;
|
||||
|
||||
|
||||
public QueueJitActualModel() {
|
||||
|
||||
}
|
||||
|
||||
public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custProdLineCode, String produceCtgyCode,
|
||||
String productSn, Integer detailStatus, String createUser, String createDatetime) {
|
||||
this.id = id;
|
||||
this.vinCode = vinCode;
|
||||
this.jisActualNo = jisActualNo;
|
||||
this.workType = workType;
|
||||
this.custProdLineCode = custProdLineCode;
|
||||
this.produceCtgyCode = produceCtgyCode;
|
||||
this.productSn = productSn;
|
||||
this.detailStatus = detailStatus;
|
||||
this.createUser = createUser;
|
||||
this.createDatetime = createDatetime;
|
||||
}
|
||||
|
||||
public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String partNo, String partName, String produceCtgyCode, Double qty,
|
||||
String createUser, String createDatetime) {
|
||||
this.id = id;
|
||||
this.vinCode = vinCode;
|
||||
this.jisActualNo = jisActualNo;
|
||||
this.partNo = partNo;
|
||||
this.partName = partName;
|
||||
this.qty = qty;
|
||||
this.createUser = createUser;
|
||||
this.createDatetime = createDatetime;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Author: jokelin
|
||||
* @Date: 2020/3/20 9:02 下午
|
||||
* @Modify:
|
||||
*/
|
||||
@Data
|
||||
public class QueueJitActualModule {
|
||||
|
||||
private Long id;
|
||||
@ApiParam("vin")
|
||||
private String vinCode;
|
||||
@ApiParam("排序号")
|
||||
private Double seq;
|
||||
@ApiParam("分组队列编号")
|
||||
private String queueGroupNo;
|
||||
@ApiParam("组内编号")
|
||||
private Integer groupNo;
|
||||
@ApiParam("JIT排序号")
|
||||
private String jitSeq;
|
||||
|
||||
public QueueJitActualModule() {
|
||||
|
||||
}
|
||||
|
||||
public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo, String jitSeq) {
|
||||
this.id = id;
|
||||
this.vinCode = vinCode;
|
||||
this.seq = seq;
|
||||
this.queueGroupNo = queueGroupNo;
|
||||
this.groupNo = groupNo;
|
||||
this.jitSeq = jitSeq;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,78 @@
|
||||
package cn.estsh.i3plus.pojo.platform.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-09-13 17:35
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="SYS_SOFT_UPDATE_RECORD")
|
||||
@ApiModel(value="软件更新记录",description = "软件更新记录")
|
||||
public class SysSoftUpdateRecord extends BaseBean {
|
||||
|
||||
@Column(name="SYSTEM_SOFT_TYPE")
|
||||
@ApiParam(value ="系统软件类型")
|
||||
private Integer systemSoftType;
|
||||
|
||||
public String getSystemSoftTypeTxt(){
|
||||
return systemSoftType == null ? "无" : CommonEnumUtil.SOFT_TYPE.valueOfDescription(systemSoftType);
|
||||
}
|
||||
|
||||
@Column(name="SYSTEM_VERSION")
|
||||
@ApiParam(value ="系统版本")
|
||||
private String systemVersion;
|
||||
|
||||
@Lob
|
||||
@Column(name="UPDATE_CONTENT")
|
||||
@ApiParam(value ="更新内容")
|
||||
private String updateContent;
|
||||
|
||||
@Column(name="FIRST_DEPLOYMENT_TIME")
|
||||
@ApiParam(value ="首次部署时间")
|
||||
private String firstDeploymentTime;
|
||||
|
||||
@Transient
|
||||
private Map<String, List<String>> updateDetailMap;
|
||||
|
||||
public void putUpdateDetail(String detailType, String detail) {
|
||||
if(updateDetailMap == null){
|
||||
updateDetailMap = new HashMap<>();
|
||||
}
|
||||
|
||||
List<String> detailList;
|
||||
if (updateDetailMap.containsKey(detailType)) {
|
||||
detailList = updateDetailMap.get(detailType);
|
||||
} else {
|
||||
detailList = new ArrayList<>();
|
||||
updateDetailMap.put(detailType, detailList);
|
||||
}
|
||||
|
||||
detailList.add(detail);
|
||||
}
|
||||
|
||||
public void transformUpdateDetail() {
|
||||
this.updateContent = JSON.toJSONString(updateDetailMap);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.platform.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysSoftUpdateRecord;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : yunhao
|
||||
* @CreateDate : 2020-09-14 13:15
|
||||
* @Modify:
|
||||
**/
|
||||
public interface SysSoftUpdateRecordRepository extends BaseRepository<SysSoftUpdateRecord, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue