yun-zuoyi
曾贞一 6 years ago
commit f53e1011a7

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.andon.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;
/**
* @Description :
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:16
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_ALARM_DETAIL_TYPE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯子类型")
public class AndonAlarmDetailType extends BaseBean {
@Column(name = "ALARM_DETAIL_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmDetailCode;
@Column(name = "ALARM_DETAIL_NAME")
@ApiParam(value = "安灯类型名称")
private String alarmDetailName;
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;
}

@ -51,4 +51,12 @@ public class AndonAlarmResponseCfg extends BaseBean {
@Column(name = "RP_LEVEL")
@ApiParam(value = "通知级别")
private String rpLevel;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME_RDD")
@ApiParam(value = "工作中心名称")
private String workCenterNameRdd;
}

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.andon.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;
/**
* @Description : ANDON_
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2019-05-31 14:08
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_DISPOSAL_CFG")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_自处理配置")
public class AndonDisposalCfg extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
private String workCellCode;
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;
@Column(name = "AC_CODE")
@ApiParam(value = "呼叫原因代码")
private String acCode;
@Column(name = "APPROVAL_STATUS")
@ApiParam(value = "审批状态")
private String approvalStatus;
}

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.andon.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;
/**
* @Description : ANDON_
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2019-05-31 9:47
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_EVENT_PHENOMENON")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_事件现象")
public class AndonEventPhenoMenon extends BaseBean {
@Column(name = "EPM_CODE")
@ApiParam(value = "事件现象代码")
private String epmCode;
@Column(name = "EPM_NAME")
@ApiParam(value = "事件现象描述")
private String epmName;
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
}

@ -22,7 +22,7 @@ import javax.persistence.Table;
**/
@Data
@Entity
@Table(name="ANDON_STOP_LINE_CFG", indexes = {
@Table(name="ANDON_HALT_CFG", indexes = {
@Index(columnList = "WORK_CENTER_CODE", name = "ANDON_INDEX_WORK_CENTER_CODE"),
@Index(columnList = "WORK_CELL_CODE", name = "ANDON_INDEX_WORK_CELL_CODE"),
@Index(columnList = "ORGANIZE_CODE", name = "ANDON_INDEX_ORGANIZE_CODE"),
@ -32,7 +32,7 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯队列")
public class AndonStopLineConfig extends BaseBean {
public class AndonHaltCfg extends BaseBean {
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.andon.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;
/**
* @Description : ANDON_
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2019-05-31 9:47
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_IMPORTANCE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_事件现象")
public class AndonImportance extends BaseBean {
@Column(name = "IMPORTANCE_CODE")
@ApiParam(value = "重要等级代码")
private String importanceCode;
@Column(name = "IMPORTANCE_NAME")
@ApiParam(value = "重要等级名称")
private String importanceName;
}

@ -245,6 +245,10 @@ public class AndonManageQueue extends BaseBean {
private Double proportion;
@Transient
@ApiParam(value = "当前比例(累加)", example = "0")
private Double currentProportion;
@Transient
@ApiParam(value = "总次数(用于报表统计)", example = "0")
private Integer sumCount;
@ -252,6 +256,41 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "发送标志")
private String sendFlag;
/**
* 10=20=
*/
@Column(name = "DISPOSAL_TYPE")
@ApiParam(value = "处理类型")
private String disposalType;
/**
* 1 = 2 =
*/
@Transient
@ApiParam(value = "是否勾选加入自处理问题库", example = "2")
private Integer isDisposal;
@Column(name = "ALARM_DETAIL_CODE")
@ApiParam(value = "安灯子类型代码")
private String alarmDetailCode;
@Column(name = "EPM_CODE")
@ApiParam(value = "事件现象代码")
private String epmCode;
@Column(name = "EPM_NAME_RDD")
@ApiParam(value = "事件现象描述")
private String epmNameRdd;
@Column(name = "IMPORTANCE_CODE")
@ApiParam(value = "重要等级代码")
private String importanceCode;
@Column(name = "IMPORTANCE_NAME_RDD")
@ApiParam(value = "重要等级名称")
private String importanceNameRdd;
// 是否转呼
public Integer getIsShiftCall() {
return this.isShiftCall == null ? 0 : this.isShiftCall;

@ -225,6 +225,37 @@ public class AndonManageRecord extends BaseBean {
@ApiParam(value = "停机具体原因")
private String haltDesc;
@Column(name = "SEND_FLAG")
@ApiParam(value = "发送标志")
private String sendFlag;
/**
* 10=20=
*/
@Column(name = "DISPOSAL_TYPE")
@ApiParam(value = "处理类型")
private String disposalType;
@Column(name = "ALARM_DETAIL_CODE")
@ApiParam(value = "安灯子类型代码")
private String alarmDetailCode;
@Column(name = "EPM_CODE")
@ApiParam(value = "事件现象代码")
private String epmCode;
@Column(name = "EPM_NAME_RDD")
@ApiParam(value = "事件现象描述")
private String epmNameRdd;
@Column(name = "IMPORTANCE_CODE")
@ApiParam(value = "重要等级代码")
private String importanceCode;
@Column(name = "IMPORTANCE_NAME_RDD")
@ApiParam(value = "重要等级名称")
private String importanceNameRdd;
// 是否转呼
public Integer getIsShiftCall() {
return this.isShiftCall == null ? 0 : this.isShiftCall;

@ -32,18 +32,10 @@ public class AndonPLC extends BaseBean {
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME")
@ApiParam(value = "工作中心名称")
private String workCenterName;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
private String workCellCode;
@Column(name = "WORK_CELL_NAME")
@ApiParam(value = "工作单元名称")
private String workCellName;
@Column(name = "NODE_CODE")
@ApiParam(value = "控制节点代码")
private String nodeCode;

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmDetailType;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description : ANDON_
* @Reference :
* @Author : sililter.yuan
* @CreateDate : 2019-05-30 11:05
* @Modify:
**/
@Repository
public interface IAndonAlarmDetailTypeRepository extends BaseRepository<AndonAlarmDetailType, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalCfg;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description : ANDON_
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2019-05-31 14:14
* @Modify:
**/
@Repository
public interface IAndonDisposalCfgRepository extends BaseRepository<AndonDisposalCfg, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonEventPhenoMenon;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description : ANDON_
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-31 11:05
* @Modify:
**/
@Repository
public interface IAndonEventPhenoMenonRepository extends BaseRepository<AndonEventPhenoMenon, Long> {
}

@ -1,6 +1,6 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonStopLineConfig;
import cn.estsh.i3plus.pojo.andon.bean.AndonHaltCfg;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
* @Modify:
**/
@Repository
public interface IAndonStopLineCfgRepository extends BaseRepository<AndonStopLineConfig, Long> {
public interface IAndonHaltCfgRepository extends BaseRepository<AndonHaltCfg, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonImportance;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description : ANDON_
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-31 11:05
* @Modify:
**/
@Repository
public interface IAndonImportanceRepository extends BaseRepository<AndonImportance, Long> {
}

@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.andon.sqlpack;
import cn.estsh.i3plus.pojo.andon.bean.*;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import org.apache.commons.lang3.StringUtils;
@ -70,6 +69,7 @@ public class AndonHqlPack {
public static DdlPackBean packHqlMesWorkCenter(MesWorkCenter mesWorkCenter){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", result);
getStringBuilderPack(mesWorkCenter, result);
return result;
@ -191,6 +191,23 @@ public class AndonHqlPack {
}
/**
*
* @param andonDisposalCfg
* @return
*/
public static DdlPackBean packHqlAndonDisposalCfg(AndonDisposalCfg andonDisposalCfg){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCenterCode(),"workCenterCode", result);
DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCellCode(),"workCellCode", result);
DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAlarmCode(),"alarmCode", result);
DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAcCode(),"acCode", result);
getStringBuilderPack(andonDisposalCfg, result);
return result;
}
/**
*
* @param andonManageRecord
* @return
@ -341,8 +358,9 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(responseCfg.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getAndonStatus(), "andonStatus", result);
DdlPreparedPack.getNumNOEqualPack(String.valueOf(AndonEnumUtil.ALARM_PRIORITY.FIRST.getValue()),
"rpLevel", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getRpLevel(), "rpLevel", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getRpObjectCode(), "rpObjectCode", result);
getStringBuilderPack(responseCfg, result);
@ -354,7 +372,7 @@ public class AndonHqlPack {
* @param stopLineConfig
* @return
*/
public static DdlPackBean packAndonStopLineCfg(AndonStopLineConfig stopLineConfig) {
public static DdlPackBean packAndonHaltCfg(AndonHaltCfg stopLineConfig) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(stopLineConfig.getAlarmCode(), "alarmCode", result);
@ -365,4 +383,46 @@ public class AndonHqlPack {
return result;
}
/**
*
* @param andonAlarmDetailType
* @return
*/
public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result);
getStringBuilderPack(andonAlarmDetailType, result);
return result;
}
/**
*
* @param andonAlarmType
* @return
*/
public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) {
DdlPackBean result = new DdlPackBean();
getStringBuilderPack(andonAlarmType, result);
return result;
}
/**
*
* @param andonStatus
* @return
*/
public static DdlPackBean packAndonStatus(AndonStatus andonStatus) {
DdlPackBean result = new DdlPackBean();
getStringBuilderPack(andonStatus, result);
return result;
}
}

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.StringUtils;
/**
* @Description :
@ -10,6 +11,80 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* @Modify:
**/
public class AndonEnumUtil {
/**
* = 10 = 20
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DISPOSAL_TYPE{
STANDARD("10","标准处理"),
SELF("20","自处理");
private String value;
private String description;
DISPOSAL_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value,val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 10=20=30=40=100=
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum APPROVAL_STATUS{
WAIT("10","待审批"),
SECOND_APPROVAL("20","二级审批"),
THIRD_APPROVAL("30","三级审批"),
FOUTH_APPROVAL("40","四级审批"),
FINISH("60","已审批");
private String value;
private String description;
APPROVAL_STATUS(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value,val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
* 10-20-
@ -49,7 +124,7 @@ public class AndonEnumUtil {
/**
*
* =10 =20 =30, 线=40
* =10 =20 =30, 线=40, =50, =60
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_BUSI_FLAG{
@ -57,7 +132,9 @@ public class AndonEnumUtil {
ALARM_FLAG("10","安灯呼叫标识"),
USER_CODE("20","用户工号"),
READ_FLAG("30", "安灯读取状态"),
STOP_FLAG("40", "停线状态");
STOP_FLAG("40", "停线状态"),
DETAIL_TYPE("50", "安灯子类型"),
AC_CODE("60", "原因代码");
private String value;
private String description;
@ -86,7 +163,9 @@ public class AndonEnumUtil {
CALL(1,"10","呼叫"),
SIGN(2,"20","响应"),
RESOLVE(3,"30","解决"),
CANCEL(4,"40", "撤销");
CANCEL(4,"40", "撤销"),
COMMIT(5,"50","提交"),
PASS(6,"60","审批");
private int value;
private String code;
@ -121,16 +200,18 @@ public class AndonEnumUtil {
/**
*
* =10 =20 =3040-50-
* 10 = 20 = 30 = 40 = 50 = 60 = 70 =
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_ACTION_FLAG{
CALL_ACTION("10","呼叫动作"),
SIGN_ACTION("20","签到动作"),
CANCEL_ACTION("30", "撤销动作"),
RESOLVE_ACTION("40", "解决动作"),
SHIFG_CALL_ACTION("50", "转呼动作");
RESOLVE_ACTION("30", "解决动作"),
CANCEL_ACTION("40", "撤销动作"),
COMMIT_ACTION("50","提交动作"),
PASS_ACTION("60","审批动作"),
SHIFG_CALL_ACTION("70", "转呼动作");
private String value;
private String description;
@ -214,6 +295,16 @@ public class AndonEnumUtil {
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
@ -280,4 +371,31 @@ public class AndonEnumUtil {
return description;
}
}
/**
*
* 10-20-
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NOTICE_WAYS{
SMS("10","短信"),
EMAIL("20","邮箱");
private String value;
private String description;
NOTICE_WAYS(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
}

@ -335,7 +335,7 @@ public class BlockFormEnumUtil {
}
}
/**
*
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ELEMENT_SHOW_STATUS {
@ -2036,4 +2036,85 @@ public class BlockFormEnumUtil {
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ELEMENT_TREE_DIRECTION {
horizontal(1, "horizontal", "横向"),
vertical(2, "vertical", "竖向");
private int value;
private String code;
private String description;
private ELEMENT_TREE_DIRECTION (int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static ELEMENT_TREE_DIRECTION valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -14,85 +14,6 @@ import java.util.List;
**/
public class BlockReportEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SOFT_TYPE {
CORE(2, "i3core", "i3业务平台");
private int value;
private String code;
private String description;
private SOFT_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static SOFT_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*

@ -113,6 +113,7 @@ public class CommonEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRUE_OR_FALSE {
TRUE(1, "是"), FALSE(2, "否");

@ -681,4 +681,33 @@ public class MesEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COMMON_SN {
QUEUE_SN("QUEUE_SN", "队列条码");
private String code;
private String description;
int value;
COMMON_SN(String code, String description) {
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
}

@ -1464,7 +1464,7 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COMPONENT_TYPE {
PROCESS_HANDLING(10, "流程处理组件,"),
PROCESS_HANDLING(10, "流程处理组件"),
PROCESS_INITIALIZATION(20, "流程初始化组件"),
PROCESS_COMMIT(30, "流程提交组件"),
DETAIL_PROCESS(40, "明细处理组件"),

@ -1415,12 +1415,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
Query query = entityManager.createQuery(sb.toString());
setParameter(query,paramName,paramValue);
double sumResult = 0.0;
List<?> objList = query.getResultList();
if(objList.size() > 0){
sumResult = Double.parseDouble(objList.iterator().next().toString());
}
return sumResult;
return getNumberByResultList(query.getResultList());
}else{
throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
}
@ -1444,12 +1439,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
Query query = entityManager.createQuery(sb.toString());
setParameter(query,paramName,paramValue);
double sumResult = 0.0;
List<?> objList = query.getResultList();
if(objList.size() > 0){
sumResult = Double.parseDouble(objList.iterator().next().toString());
}
return sumResult;
return getNumberByResultList(query.getResultList());
}else{
throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
}
@ -1472,12 +1462,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
Query query = entityManager.createQuery(sb.toString());
setParameter(query,paramName,paramValue);
double sumResult = 0.0;
List<?> objList = query.getResultList();
if(objList.size() > 0){
sumResult = Double.parseDouble(objList.iterator().next().toString());
}
return sumResult;
return getNumberByResultList(query.getResultList());
}else{
throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
}
@ -1501,14 +1486,24 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
Query query = entityManager.createQuery(sb.toString());
setParameter(query,paramName,paramValue);
double sumResult = 0.0;
List<?> objList = query.getResultList();
if(objList.size() > 0){
sumResult = Double.parseDouble(objList.iterator().next().toString());
}
return sumResult;
return getNumberByResultList(query.getResultList());
}else{
throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
}
}
//从结果集中获取数字转换
public double getNumberByResultList(List objList){
double num = 0.0;
if(objList != null && objList.size() > 0){
if(objList.get(0) != null){
try {
num = Double.parseDouble(objList.get(0).toString());
}catch(NumberFormatException ne){
LOGGER.error("数字转换出错!",ne);
}
}
}
return num;
}
}

@ -57,6 +57,10 @@ public class BfCascadeDetail extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
@Column(name = "PARENT_DEFAULT_VALUE")
@ApiParam(value = "父级默认值")
private String parentDefaultValue;
@Column(name = "PARENT_NAME_RDD")
@ApiParam(value = "父级名称")
private String parentNameRdd;

@ -45,11 +45,11 @@ public class BfElementPropertyVirtual extends BaseBean {
private Long dataObjectId;
@Column(name="PROPERTY_CODE")
@ApiParam(value ="类属性名称")
@ApiParam(value ="虚拟属性代码")
private String propertyCode;
@Column(name="PROPERTY_NAME")
@ApiParam(value ="元素名称")
@ApiParam(value ="虚拟属性名称")
private String propertyName;
@Column(name="PROPERTY_TYPE")

@ -37,6 +37,10 @@ public class MesProduceSn extends BaseBean {
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="QTY")
@ApiParam("数量")
private Double qty;
@ -128,4 +132,31 @@ public class MesProduceSn extends BaseBean {
public int getPrintStatusVal() {
return this.printStatus == null ? 0 : this.printStatus;
}
@Override
public String toString() {
return "MesProduceSn{" +
"serialNumber='" + serialNumber + '\'' +
", partNo='" + partNo + '\'' +
", partNameRdd='" + partNameRdd + '\'' +
", qty=" + qty +
", qcStatus=" + qcStatus +
", snStatus=" + snStatus +
", printCount=" + printCount +
", printStatus=" + printStatus +
", workCenterCode='" + workCenterCode + '\'' +
", workCellCode='" + workCellCode + '\'' +
", routeCode='" + routeCode + '\'' +
", processCode='" + processCode + '\'' +
", nextProcessCode='" + nextProcessCode + '\'' +
", inWorkCenterTime='" + inWorkCenterTime + '\'' +
", outWorkCenterTime='" + outWorkCenterTime + '\'' +
", shippingTime='" + shippingTime + '\'' +
", workOrderNo='" + workOrderNo + '\'' +
", custSn='" + custSn + '\'' +
", custPartNo='" + custPartNo + '\'' +
", packageSn='" + packageSn + '\'' +
", resultMsg='" + resultMsg + '\'' +
'}';
}
}

@ -0,0 +1,134 @@
package cn.estsh.i3plus.pojo.mes.pcn.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 javax.persistence.Transient;
/**
* @Description :
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 16:22
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PRODUCE_SN_TRAVEL")
@Api("产品条码履历表")
public class MesProduceSnTravel extends BaseBean {
@Column(name="SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name="PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="QTY")
@ApiParam("数量")
private Double qty;
@Column(name="QC_STATUS")
@ApiParam("质量状态")
private Integer qcStatus;
@Column(name="SN_STATUS")
@ApiParam("条码状态")
private Integer snStatus;
@Column(name="PRINT_COUNT")
@ApiParam("打印次数")
private Integer printCount;
@Column(name="PRINT_STATUS")
@ApiParam("打印状态")
private Integer printStatus;
@Column(name="WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name="PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name="NEXT_PROCESS_CODE")
@ApiParam("下一工序代码")
private String nextProcessCode;
@Column(name="IN_WC_TIME")
@ApiParam("进产线时间")
private String inWorkCenterTime;
@Column(name="OUT_WC_TIME")
@ApiParam("出产线时间")
private String outWorkCenterTime;
@Column(name="SHIPPING_TIME")
@ApiParam("发运时间")
private String shippingTime;
@Column(name="WORK_ORDER_NO")
@ApiParam("生产工单号")
private String workOrderNo;
@Column(name="CUST_SN")
@ApiParam("客户条码")
private String custSn;
@Column(name="CUST_PART_NO")
@ApiParam("客户零件号")
private String custPartNo;
@Column(name="PACKAGE_SN")
@ApiParam("包装条码")
private String packageSn;
@Transient
@ApiParam("返回信息")
private String resultMsg;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
public int getQcStatusVal() {
return this.qcStatus == null ? 0 : this.qcStatus;
}
public int getSnStatusVal() {
return this.snStatus == null ? 0 : this.snStatus;
}
public int getPrintCountVal() {
return this.printCount == null ? 0 : this.printCount;
}
public int getPrintStatusVal() {
return this.printStatus == null ? 0 : this.printStatus;
}
}

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description:
@ -24,48 +25,57 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_QUEUE_ORDER_DETAIL")
@Table(name = "MES_QUEUE_ORDER_DETAIL")
@Api("生产队列明细")
public class MesQueueOrderDetail extends BaseBean {
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("主队列编号")
private String orderNo;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="SERIAL_NUMBER")
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name="SEQ")
@Column(name = "SEQ")
@ApiParam("队列明细序号")
private Double seq;
@Column(name="QTY")
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name="STATUS")
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name="WORK_TYPE")
@Column(name = "WORK_TYPE")
@ApiParam("生产类型")
private String workType;
@Column(name="PRODUCE_CATEGORY_CODE")
@Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品类型代码")
private String produceCategoryCode;
@Column(name="PRODUCE_CATEGORY_NAME_RDD")
@Column(name = "PRODUCE_CATEGORY_NAME_RDD")
@ApiParam("产品类型名称")
private String produceCategoryNameRdd;
@Transient
@ApiParam("队列序号")
private Double queueSeq;
public double getQueueSeqVal() {
return this.queueSeq == null ? 0.0d : this.queueSeq;
}
public double getSeqVal() {
return this.seq == null ? 0.0d : this.seq;
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSnTravel;
import org.springframework.stereotype.Repository;
/**
* @Description : Dao
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 16:36
* @Modify:
**/
@Repository
public interface MesProduceSnTravelRepository extends BaseRepository<MesProduceSnTravel, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellPoint;
import org.springframework.stereotype.Repository;
/**
* @Description :Dao
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 14:40
* @Modify:
**/
@Repository
public interface MesWorkCellPointRepository extends BaseRepository<MesWorkCellPoint, Long> {
}

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description:
@ -108,6 +109,10 @@ public class MesProduceSn extends BaseBean {
@ApiParam("包装条码")
private String packageSn;
@Transient
@ApiParam("返回信息")
private String resultMsg;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

@ -0,0 +1,27 @@
package cn.estsh.i3plus.pojo.mes.bean;
import io.swagger.annotations.Api;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 16:22
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PRODUCE_SN_TRAVEL")
@Api("产品条码履历表")
public class MesProduceSnTravel extends MesProduceSn {
}

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description:
@ -66,6 +67,14 @@ public class MesQueueOrderDetail extends BaseBean {
@Column(name="PRODUCE_CATEGORY_NAME_RDD")
@ApiParam("产品类型名称")
private String produceCategoryNameRdd;
@Transient
@ApiParam("队列序号")
private Double queueSeq;
public double getQueueSeqVal() {
return this.queueSeq == null ? 0.0d : this.queueSeq;
}
public double getSeqVal() {
return this.seq == null ? 0.0d : this.seq;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSnTravel;
import org.springframework.stereotype.Repository;
/**
* @Description : Dao
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 16:36
* @Modify:
**/
@Repository
public interface MesProduceSnTravelRepository extends BaseRepository<MesProduceSnTravel, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellPoint;
import org.springframework.stereotype.Repository;
/**
* @Description :Dao
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 14:40
* @Modify:
**/
@Repository
public interface MesWorkCellPointRepository extends BaseRepository<MesWorkCellPoint, Long> {
}

@ -32,6 +32,17 @@ public class WmsBsonPack {
bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson);
bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson);
bson = BsonPackTool.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", bson);
if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="")
|| (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){
bson = BsonPackTool.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", bson, true);
}
if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "")
|| (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){
bson = BsonPackTool.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", bson, true);
}
return bson;
}

@ -56,6 +56,10 @@ public class WmsMoveSn extends BaseBean {
@ApiParam("条码")
public String sn;
@Column(name="CSN")
@ApiParam("客户条码")
public String csn;
/**
* :1=,10=,20=
*/

@ -44,6 +44,10 @@ public class WmsZones extends BaseBean {
@ApiParam(value = "存储区名称")
private String zoneName;
@Column(name = "PARENT_ZONE_NO")
@ApiParam(value = "上层存储区")
private String parentZoneNo;
@Column(name = "IS_PM")
@ApiParam(value = "零件级管控" , example = "2")
private Integer isPm;

@ -170,10 +170,25 @@ public class WmsHqlPack {
/**
* 线
* @param wmsRoutingDetail
* @return
*/
public static DdlPackBean packHqlWmsRoutingDetail(WmsRoutingDetail wmsRoutingDetail) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsRoutingDetail.getRoutingCode(), "routingCode", result);
getStringBuilderPack(wmsRoutingDetail, result);
return result;
}
/**
* 线
*
* @param routingCode
* @return
*/
@Deprecated
public static DdlPackBean packHqlWmsRoutingChildren(String routingCode) {
DdlPackBean result = new DdlPackBean();
@ -184,6 +199,19 @@ public class WmsHqlPack {
return result;
}
/**
* 线
* @param wmsRoutingAssign
* @return
*/
public static DdlPackBean packHqlWmsRoutingAssign(WmsRoutingAssign wmsRoutingAssign) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsRoutingAssign.getRoutingCode(), "routingCode", result);
getStringBuilderPack(wmsRoutingAssign, result);
return result;
}
/**
* 线
@ -540,6 +568,10 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result);
//供应商编号
DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result);
//关联单号
DdlPreparedPack.getStringLikerPack(wmsCheckFactRecord.getRefSrc(), "refSrc", result);
//关联单单据类型
DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getRefType(), "refType", result);
getStringBuilderPack(wmsCheckFactRecord, result);

Loading…
Cancel
Save