I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
宋军超 5 years ago
parent f5074fba08 94c7526d65
commit 56dec41ad0
10 changed files with 348 additions and 1 deletions
Show Stats Download Patch File Download Diff File

63
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java
Unescape Escape View File

@ -0,0 +1,63 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
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.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: jessica.chen
* @CreateDate:
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BLIND_HISTORY")
@Api("MES_盲检记录")
public class MesBlindHistory extends BaseBean implements Serializable {
private static final long serialVersionUID = -7459452475180601499L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "BLIND_OBJECT")
@ApiParam("盲检对象")
private String blindObject;
@Column(name = "BLIND_ITEM")
@ApiParam("盲检问题")
private String blindItem;
@Column(name = "SYSTEM_ANSWER")
@ApiParam("系统答案")
private String systemAnswer;
@Column(name = "CHOOSED_ANSWER")
@ApiParam("选中答案")
private String choosedAnswer;
@Column(name = "CHECKED")
@ApiParam("是否一致")
private Integer checked;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
}

65
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java
Unescape Escape View File

@ -0,0 +1,65 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: jessica.chen
* @CreateDate:
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BLIND_RULE")
@Api("MES_盲检规则")
public class MesBlindRule extends BaseBean implements Serializable {
private static final long serialVersionUID = -7459452475180601498L;
@Column(name = "RULE_ID")
@ApiParam("匹配规则ID")
private String ruleId;
@Column(name = "CAR_TYPE")
@ApiParam("车辆类型")
private String carType;
@Column(name = "CAR_COLOR")
@ApiParam("车辆颜色")
private String carColor;
@Column(name = "PART_CODE")
@ApiParam("零件号")
private String partCode;
@Column(name = "PART_NAME")
@ApiParam("零件名称")
private String partName;
@Column(name = "CAR_CONFIG")
@ApiParam("配置")
private String carConfig;
@Column(name = "CAR_LEVEL")
@ApiParam("等级")
private String carLevel;
@Column(name = "PART_COLOR")
@ApiParam("零件颜色")
private String partColor;
}

65
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java
Unescape Escape View File

@ -0,0 +1,65 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: jessica.chen
* @CreateDate:
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BLIND_TOPIC_SETTING")
@Api("MES_盲检问题设置")
public class MesBlindTopicSetting extends BaseBean implements Serializable {
private static final long serialVersionUID = -7459452475180601497L;
@Column(name = "TOPIC_ID")
@ApiParam("序号")
private String topicId;
@Column(name = "TOPIC_CODE")
@ApiParam("题目编号")
private String topicCode;
@Column(name = "TOPIC_DESC")
@ApiParam("题目描述")
private String topicDesc;
@Column(name = "TOPIC_OBJECT")
@ApiParam("零件名称")
private String topicObject;
@Column(name = "TOPIC_TYPE")
@ApiParam("盲检类型")
private Integer topicType;
@Column(name = "QTY")
@ApiParam("答案数量")
private Integer qty;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
}

35
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java
Unescape Escape View File

@ -0,0 +1,35 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description : 盲检问题清单
* @Reference :
* @author: jessica.chen
* @date: 2020/4/16 17:10
* @Modify:
*/
@Data
@Api(value="盲检问题清单",description = "盲检问题清单")
public class MesBlindProbleModel extends BaseBean {
private static final long serialVersionUID = 5790342327875844345L;
@ApiParam(value = "零件名称")
private String partName;
@ApiParam(value = "提问内容")
private String questionContents;
@ApiParam(value = "答案集合")
private List<String> answerList;
@ApiParam(value = "正确答案")
private String rightKey;
}

53
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindRuleModel.java
Unescape Escape View File

@ -0,0 +1,53 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : 盲检规则模板
* @Reference :
* @author: jessica.chen
* @date: 2020/4/16 17:10
* @Modify:
*/
@Data
@Api(value="盲检规则模板",description = "盲检规则模板")
public class MesBlindRuleModel extends BaseBean {
private static final long serialVersionUID = 5790342327875844321L;
@ApiParam(value = "车辆类型")
@AnnoOutputColumn
private String carType;
@ApiParam(value = "车辆颜色")
@AnnoOutputColumn
private String carColor;
@ApiParam(value = "零件号")
private String partCode;
@ApiParam(value = "零件名称")
@AnnoOutputColumn
private String partName;
@ApiParam(value = "配置")
@AnnoOutputColumn
private String carConfig;
@ApiParam(value = "等级")
@AnnoOutputColumn
private String carLevel;
@ApiParam(value = "零件颜色")
@AnnoOutputColumn
private String partColor;
@ApiParam(value = "下标")
@AnnoOutputColumn
private Integer index;
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindHistoryRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBlindHistory;
/**
* @Description:
* @Reference:
* @Author: jessica.chen
* @CreateDate: 2019\11\18 10:34
* @Modify:
**/
public interface MesBlindHistoryRepository extends BaseRepository<MesBlindHistory, Long> {
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindRuleRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBlindRule;
/**
* @Description:
* @Reference:
* @Author: jessica.chen
* @CreateDate: 2019\11\18 10:34
* @Modify:
**/
public interface MesBlindRuleRepository extends BaseRepository<MesBlindRule, Long> {
}

15
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBlindTopicSettingRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBlindHistory;
import cn.estsh.i3plus.pojo.mes.bean.MesBlindTopicSetting;
/**
* @Description:
* @Reference:
* @Author: jessica.chen
* @CreateDate: 2019\11\18 10:34
* @Modify:
**/
public interface MesBlindTopicSettingRepository extends BaseRepository<MesBlindTopicSetting, Long> {
}

23
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -2888,6 +2888,29 @@ public class MesHqlPack {
return result;
}
public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) {
DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode());
DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean);
DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean);
DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean);
DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean);
DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean);
DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean);
DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean);
DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean);
return packBean;
}
public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) {
DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode());
DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode()", packBean);
DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicDesc(), "topicDesc", packBean);
DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(mesBlindTopicSetting.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean);
return packBean;
}
/**
* MES 校枪记录
*

2
sonar-project.properties
Unescape Escape View File

@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
# defaults to project key
sonar.projectName=i3plus-pojo
# defaults to 'not provided'
sonar.projectVersion=1.0-DEV-SNAPSHOT
sonar.projectVersion=1.0-TEST-SNAPSHOT
# Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./

Write Preview
Loading…
Cancel
Save