Merge remote-tracking branch 'origin/dev' into test

yun-zuoyi
jenkins 6 years ago
commit ac8b9d3986

@ -1,38 +0,0 @@
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-13 9:47
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_ACTION")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_动作")
public class AndonAction extends BaseBean {
@Column(name = "ACTION_CODE")
@ApiParam(value = "动作代码")
private String actionCode;
@Column(name = "ACTION_NAME")
@ApiParam(value = "动作名称")
private String actionName;
}

@ -28,19 +28,21 @@ import javax.persistence.Table;
@Api("ANDON_呼叫原因")
public class AndonAlarmCause extends BaseBean {
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
@Column(name = "AC_CODE")
@ApiParam(value = "呼叫原因代码")
private String acCode;
@Column(name = "PARENT_AC_CODE")
@ApiParam(value = "父阶原因代码")
private String parentAcCode;
@Column(name = "AC_NAME")
@ApiParam(value = "呼叫原因描述")
private String acName;
@Column(name = "PARENT_AC_CODE")
@ApiParam(value = "父阶原因代码")
private String parentAcCode;
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
}

@ -1,38 +0,0 @@
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_TYPE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯类型")
public class AndonAlarmType extends BaseBean {
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;
@Column(name = "ALARM_NAME")
@ApiParam(value = "安灯类型名称")
private String alarmName;
}

@ -1,38 +0,0 @@
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;
}

@ -274,6 +274,10 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "安灯子类型代码")
private String alarmDetailCode;
@Column(name = "ALARM_DETAIL_NAME_RDD")
@ApiParam(value = "安灯子类型名称")
private String alarmDetailNameRdd;
@Column(name = "EPM_CODE")
@ApiParam(value = "事件现象代码")
private String epmCode;

@ -1,38 +0,0 @@
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_RESPONSE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯通知方式")
public class AndonResponse extends BaseBean {
@Column(name = "RESPONSE_CODE")
@ApiParam(value = "通知方式代码")
private String responseCode;
@Column(name = "RESPONSE_NAME")
@ApiParam(value = "通知方式名称")
private String responseName;
}

@ -1,38 +0,0 @@
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_STATUS")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯状态")
public class AndonStatus extends BaseBean {
@Column(name = "STATUS_CODE")
@ApiParam(value = "状态代码")
private String statusCode;
@Column(name = "STATUS_NAME")
@ApiParam(value = "状态名称")
private String statusName;
}

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

@ -1,16 +0,0 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :()
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:27
* @Modify:
**/
@Repository
public interface IAndonAlarmTypeRepository extends BaseRepository<AndonAlarmType,Long> {
}

@ -1,16 +0,0 @@
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> {
}

@ -1,16 +0,0 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonResponse;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :()
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:27
* @Modify:
**/
@Repository
public interface IAndonResponseRepository extends BaseRepository<AndonResponse,Long> {
}

@ -1,16 +0,0 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonStatus;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :()
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2019-05-10 17:27
* @Modify:
**/
@Repository
public interface IAndonStatusRepository extends BaseRepository<AndonStatus,Long> {
}

@ -401,45 +401,19 @@ public class AndonHqlPack {
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;
}
/**
* ANDON
* @param andonResponse
* @return
*/
public static DdlPackBean packAndonResponse(AndonResponse andonResponse){
DdlPackBean result = new DdlPackBean();
getStringBuilderPack(andonResponse, result);
return result;
}
//
// /**
// * 安灯类型查询条件封装
// * @param andonAlarmType
// * @return
// */
// public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) {
// DdlPackBean result = new DdlPackBean();
//
// getStringBuilderPack(andonAlarmType, result);
//
// return result;
// }
/**
* ANDON
@ -450,7 +424,7 @@ public class AndonHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result);
DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result);
DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result);
DdlPreparedPack.getStringLikerPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result);
getStringBuilderPack(andonResponseObject, result);

@ -90,15 +90,14 @@ public class AndonEnumUtil {
* 10-20-
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IS_ALARM_STATUS{
public enum ALARM_STATUS {
YES(10,"需要按灯"),
ON(20,"不需要按灯");
private int value;
private String description;
IS_ALARM_STATUS(int value, String description) {
ALARM_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -128,7 +127,6 @@ public class AndonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_BUSI_FLAG{
ALARM_FLAG("10","安灯呼叫标识"),
USER_CODE("20","用户工号"),
READ_FLAG("30", "安灯读取状态"),
@ -158,8 +156,7 @@ public class AndonEnumUtil {
* 1-2-3-
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_FLAG{
public enum ANDON_ACTION_TAG {
CALL(1,"10","呼叫"),
SIGN(2,"20","响应"),
RESOLVE(3,"30","解决"),
@ -171,7 +168,7 @@ public class AndonEnumUtil {
private String code;
private String description;
ALARM_FLAG(int value,String code, String description) {
ANDON_ACTION_TAG(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -198,37 +195,7 @@ public class AndonEnumUtil {
}
}
/**
*
* 10 = 20 = 30 = 40 = 50 = 60 = 70 =
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_ACTION_FLAG{
CALL_ACTION("10","呼叫动作"),
SIGN_ACTION("20","签到动作"),
RESOLVE_ACTION("30", "解决动作"),
CANCEL_ACTION("40", "撤销动作"),
COMMIT_ACTION("50","提交动作"),
PASS_ACTION("60","审批动作"),
SHIFG_CALL_ACTION("70", "转呼动作");
private String value;
private String description;
ANDON_ACTION_FLAG(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
*
@ -236,7 +203,6 @@ public class AndonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_PRIORITY{
FIRST(10,"一级"),
SECOND(20,"二级"),
THIRD(30,"三级");
@ -268,52 +234,14 @@ public class AndonEnumUtil {
}
}
/**
*
* 10 - 20 - 30 - 40 -
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NOTICE_LEVEL{
FIRST(10,"一级"),
SECOND(20,"二级"),
THIRD(30,"三级"),
FOUTH(40,"四级");
private int value;
private String description;
NOTICE_LEVEL(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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;
}
}
/**
* ANDONMM= QM= EQ= GY= JC=
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_CODE{
public enum ALARM_TYPE {
PART("PART_ALARM","物料"),
QUALITY("QUALITY_ALARM","质量"),
EQUIP("EQUMENT_ALARM","设备"),
@ -323,7 +251,7 @@ public class AndonEnumUtil {
private String value;
private String description;
ALARM_CODE(String value, String description) {
ALARM_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
@ -352,7 +280,6 @@ public class AndonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROD_ORG_LEVEL{
LEVEL_ONE(1,"一级目录"),
LEVEL_TWO(2,"二级目录"),
LEVEL_THREE(3,"三级目录"),
@ -391,7 +318,6 @@ public class AndonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOP_LINE_FLAG{
STOP("1","停止产线"),
RESTART("0","启动产线");
@ -417,15 +343,91 @@ public class AndonEnumUtil {
* 10-20-
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NOTICE_WAYS{
public enum NOTICE_MESSAGE_SEND_TYPE {
SMS("10","短信"),
EMAIL("20","邮箱");
private String value;
private String description;
NOTICE_WAYS(String value, String description) {
NOTICE_MESSAGE_SEND_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
*
* 10 - 20 - 30 - 40 -
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NOTICE_MESSAGE_SEND_LEVEL {
FIRST(10,"一级"),
SECOND(20,"二级"),
THIRD(30,"三级"),
FOUTH(40,"四级");
private int value;
private String description;
NOTICE_MESSAGE_SEND_LEVEL(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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;
}
}
/**
*
* <per>
* <br/> 10 =
* <br/> 20 =
* <br/> 30 =
* <br/> 40 =
* <br/> 50 =
* <br/> 60 =
* <br/> 70 =
* </per>
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_ACTION_FLAG{
CALL_ACTION("10","呼叫动作"),
SIGN_ACTION("20","签到动作"),
RESOLVE_ACTION("30", "解决动作"),
CANCEL_ACTION("40", "撤销动作"),
COMMIT_ACTION("50","提交动作"),
PASS_ACTION("60","审批动作"),
SHIFG_CALL_ACTION("70", "转呼动作");
private String value;
private String description;
ANDON_ACTION_FLAG(String value, String description) {
this.value = value;
this.description = description;
}
@ -438,4 +440,5 @@ public class AndonEnumUtil {
return description;
}
}
}

@ -61,8 +61,4 @@ public class WmsTransType extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long tmId;
@Column(name = "OP_TYPE_ID")
@ApiParam(value = "作业类型编号", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long opTypeId;
}

@ -29,6 +29,7 @@ public class MappingItem {
public String destName;
/**
*
* 使 #date, #time, #guid, #Q.warehouse(#zone)
*/
public Object defaultValue;

@ -0,0 +1,26 @@
package cn.estsh.i3plus.pojo.wms.dbinterface;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class UpdateSyncItem {
/**
*
*/
public String columnName;
/**
*
*
* #sap_date, #sap_time, #guid
*/
public String updateValue;
}

@ -39,33 +39,34 @@ public class WmsInterfaceDataMapper extends BaseBean {
/**
*
*/
@Column(name = "SCR_DATA_SOURCE", length = 50)
@Column(name = "SRC_DATA_SOURCE", length = 50)
public String dataSource;
/**
*
*/
@Column(name = "SCR_TABLE_NAME", length = 50)
@Column(name = "SRC_TABLE_NAME", length = 50)
public String srcTableName;
/**
*
*/
@Column(name = "SCR_ORDER_BY", length = 50)
@Column(name = "SRC_ORDER_BY", length = 50)
public String srcOrderBy;
/**
*
*/
@Column(name = "SCR_WHERE", length = 255)
public String scrWhere;
@Column(name = "SRC_WHERE", length = 255)
public String srcWhere;
/**
*
* SYNFLG=Y,SYNDATE={Date}
* SYNFLG=Y,SYNDATE={#XX}
* 使 #sap_date, #sap_time, #date, #time, #guid
*/
@Column(name = "SCR_UPDATE_SYNC", length = 255)
@Column(name = "SRC_UPDATE_SYNC", length = 255)
public String srcUpdateSync;
/**
*
*/
@Column(name = "SCR_PK_COLUMNS", length = 255)
@Column(name = "SRC_PK_COLUMNS", length = 255)
public String srcPkColumns;
/**
* ()...

@ -1173,8 +1173,8 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsActionStepType.getAtNameC(), "atNameC", result);
DdlPreparedPack.getStringLikerPack(wmsActionStepType.getFunCallName(), "funCallName", result);
getStringBuilderPack(wmsActionStepType, result);
DdlPreparedPack.getNumEqualPack(wmsActionStepType.getIsValid(), "isValid", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result;
}

Loading…
Cancel
Save