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

master merge test

Browse Source
yun-zuoyi
王杰 5 years ago
parent 9461057a07 930472492f
commit 9a74188e55
9 changed files with 58 additions and 22 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -4016,7 +4016,8 @@ public class MesPcnEnumUtil {
public enum PRODUCE_ERROR_RECORD {
JUMP_PROCESS(10, "跳过工序"),
JUMP_STEP(20, "跳过工步"),
JUMP_STATE(30, "跳过状态点");
JUMP_STATE(30, "跳过状态点"),
ABNORMAL_DEDUCTION(40, "扣减异常");
private int value;
private String description;

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

@ -9,9 +9,7 @@ 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 javax.persistence.*;
import java.io.Serializable;
/**
@ -26,7 +24,9 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CELL_FEED_RECORD")
@Table(name = "MES_CELL_FEED_RECORD", indexes = {
@Index(columnList = "ORDER_NO")
})
@Api("工位投料履历信息")
public class MesCellFeedRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 1947971369489107783L;

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

@ -28,6 +28,7 @@ import java.io.Serializable;
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "KP_SN"),
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "MODIFY_DATE_TIME"),
@Index(columnList = "ITEM_PART_NO")
})
@Api("产品绑定记录表")

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

@ -28,7 +28,7 @@ public class MesProduceErrorRecord extends BaseBean {
private static final long serialVersionUID = 209753108845613052L;
@Column(name = "ERROR_TYPE")
@ApiParam("异常类型 10:工序跳过 20:工步跳过")
@ApiParam("异常类型 10:工序跳过 20:工步跳过 40:扣料异常")
private Integer errorType;
@Column(name = "SERIAL_NUMBER")
@ -63,5 +63,8 @@ public class MesProduceErrorRecord extends BaseBean {
@ApiParam("状态点代码")
private String statusCode;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常内容")
private String errorMessage;
}

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

@ -92,6 +92,14 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@ApiParam("数量标识")
private String numberFlag;
@Column(name = "MAXIMUM")
@ApiParam("最大数")
private Double maximum = 0d;
@Column(name = "MINIMUM")
@ApiParam("最小数")
private Double minimum = 0d;
@Transient
@ApiParam("检测类型名称")
private String checkTypeName;

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

@ -87,4 +87,12 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
@ApiParam(value = "检测项类型名称")
@Transient
private String businessTypeName;
@Column(name = "MAXIMUM")
@ApiParam("最大数")
private Double maximum = 0d;
@Column(name = "MINIMUM")
@ApiParam("最小数")
private Double minimum = 0d;
}

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

@ -23,7 +23,8 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = {
@Index(columnList = "CREATE_DATE_TIME")
@Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "WORK_CENTER_CODE")
})
@Api("工位监控异常信息")
public class MesWorkCellMonitorLog extends BaseBean implements Serializable {

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

@ -15,6 +15,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.List;
/**
* @Description:
* @Reference: Mes 条件封装
@ -2043,7 +2044,7 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean);
}
if(!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) {
if (!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesProdBindRecord.getCreateDateTimeStart(),
mesProdBindRecord.getCreateDateTimeEnd(),
@ -2382,19 +2383,20 @@ public class MesHqlPack {
/**
* 界面组件配置
*
* @param windowModule
* @param organizeCode
* @return
*/
public static DdlPackBean getMesWindowModule(MesWindowModule windowModule, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(windowModule, organizeCode);
if(!StringUtils.isEmpty(windowModule.getWindowNo())){
if (!StringUtils.isEmpty(windowModule.getWindowNo())) {
DdlPreparedPack.getStringLikerPack(windowModule.getWindowNo(), "windowNo", packBean);
}
if(!StringUtils.isEmpty(windowModule.getModuleCode())){
if (!StringUtils.isEmpty(windowModule.getModuleCode())) {
DdlPreparedPack.getStringLikerPack(windowModule.getModuleCode(), "moduleCode", packBean);
}
if(!StringUtils.isEmpty(windowModule.getWindowModuleBack())){
if (!StringUtils.isEmpty(windowModule.getWindowModuleBack())) {
DdlPreparedPack.getStringLikerPack(windowModule.getWindowModuleBack(), "windowModuleBack", packBean);
}
return packBean;
@ -2402,22 +2404,23 @@ public class MesHqlPack {
/**
* 界面组件参数配置
*
* @param windowModuleParam
* @param organizeCode
* @return
*/
public static DdlPackBean getMesWindowModuleParam(MesWindowModuleParam windowModuleParam, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(windowModuleParam, organizeCode);
if(!StringUtils.isEmpty(windowModuleParam.getWindowNo())){
if (!StringUtils.isEmpty(windowModuleParam.getWindowNo())) {
DdlPreparedPack.getStringLikerPack(windowModuleParam.getWindowNo(), "windowNo", packBean);
}
if(!StringUtils.isEmpty(windowModuleParam.getModuleCode())){
if (!StringUtils.isEmpty(windowModuleParam.getModuleCode())) {
DdlPreparedPack.getStringLikerPack(windowModuleParam.getModuleCode(), "moduleCode", packBean);
}
if(!StringUtils.isEmpty(windowModuleParam.getParamCode())){
if (!StringUtils.isEmpty(windowModuleParam.getParamCode())) {
DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamCode(), "paramCode", packBean);
}
if(!StringUtils.isEmpty(windowModuleParam.getParamValue())){
if (!StringUtils.isEmpty(windowModuleParam.getParamValue())) {
DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamValue(), "paramValue", packBean);
}
return packBean;
@ -2425,22 +2428,23 @@ public class MesHqlPack {
/**
* 数据预警配置
*
* @param dataWarning
* @param organizeCode
* @return
*/
public static DdlPackBean getMesDataWarning(MesDataWarning dataWarning, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(dataWarning, organizeCode);
if(!StringUtils.isEmpty(dataWarning.getObjectCode())){
if (!StringUtils.isEmpty(dataWarning.getObjectCode())) {
DdlPreparedPack.getStringLikerPack(dataWarning.getObjectCode(), "objectCode", packBean);
}
if(!StringUtils.isEmpty(dataWarning.getWarningRule())){
if (!StringUtils.isEmpty(dataWarning.getWarningRule())) {
DdlPreparedPack.getStringLikerPack(dataWarning.getWarningRule(), "warningRule", packBean);
}
if(!StringUtils.isEmpty(dataWarning.getWarningItem())){
if (!StringUtils.isEmpty(dataWarning.getWarningItem())) {
DdlPreparedPack.getStringLikerPack(dataWarning.getWarningItem(), "warningItem", packBean);
}
if(!StringUtils.isEmpty(dataWarning.getInformMode())){
if (!StringUtils.isEmpty(dataWarning.getInformMode())) {
DdlPreparedPack.getNumEqualPack(dataWarning.getInformMode(), "informMode", packBean);
}
return packBean;
@ -2464,6 +2468,7 @@ public class MesHqlPack {
return result;
}
/**
* 封装公用查询参数
*
@ -2491,9 +2496,9 @@ public class MesHqlPack {
}
/**
* 按条件分页查询产品条码补打印数据
*
* @param mesProduceSn
* @return
*/
@ -2720,7 +2725,7 @@ public class MesHqlPack {
public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) {
DdlPackBean packBean;
if(dataAuth.getIsValidVal() == 0) {
if (dataAuth.getIsValidVal() == 0) {
packBean = DdlPackBean.getDdlPackBean(organizeCode);
} else {
packBean = DdlPackBean.getDdlPackBean(organizeCode, dataAuth.getIsValidVal());
@ -2875,6 +2880,7 @@ public class MesHqlPack {
/**
* 导入模板信息分页查询条件
*
* @param template
* @return
*/
@ -2889,6 +2895,7 @@ public class MesHqlPack {
/**
* 导入模板明细信息分页查询条件
*
* @param details
* @return
*/
@ -2951,6 +2958,7 @@ public class MesHqlPack {
/**
* 物料校验项
*
* @param partCheck
* @param organizeCode
* @return
@ -2996,6 +3004,7 @@ public class MesHqlPack {
/**
* MES AGV停机记录信息条件查询
*
* @param stopRecord
* @return
*/
@ -3099,6 +3108,7 @@ public class MesHqlPack {
/**
* 扩展对象配置
*
* @param extendObjectCfg
* @param organizeCode
* @return
@ -3122,6 +3132,7 @@ public class MesHqlPack {
/**
* 产品工作中心配置
*
* @param prodWorkCenter
* @param organizeCode
* @return
@ -3139,6 +3150,7 @@ public class MesHqlPack {
/**
* 客户JIT预装队列
*
* @param queueJitPlan
* @param organizeCode
* @return
@ -3173,6 +3185,7 @@ public class MesHqlPack {
/**
* 客户JIT预装队列明细
*
* @param queueJitPlanDetail
* @param organizeCode
* @return
@ -3190,6 +3203,7 @@ public class MesHqlPack {
/**
* 客户JIT预装队列BOM
*
* @param queueJitPlanBom
* @param organizeCode
* @return

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-TEST-SNAPSHOT
sonar.projectVersion=1.0-PROD-SNAPSHOT
# Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./

Write Preview
Loading…
Cancel
Save