yun-zuoyi
陈思洁 6 years ago
commit b0065bd650

@ -4829,4 +4829,39 @@ public class WmsEnumUtil {
}
}
/**
*
* 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PUSH_TYPE {
EMAIL(10, "邮件"), SMS(20, "短信");
private int value;
private String description;
PUSH_TYPE(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;
}
}
}

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
@ -37,6 +38,7 @@ public class MesPatternJis extends BaseBean {
@ApiParam("模式名称")
private String patternName;
@Lob
@Column(name = "RULE")
@ApiParam("规则")
private String rule;

@ -58,6 +58,9 @@ public class MesEquTaskPlanModel implements Serializable {
@ApiParam("修改日期")
public String modifyDatetime;
@ApiParam("修改日期")
public String modifyDatetimePlan;
@ApiParam("作业类型名称")
private String taskTypeName;
@ -69,7 +72,7 @@ public class MesEquTaskPlanModel implements Serializable {
}
public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimePlan) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
@ -87,5 +90,6 @@ public class MesEquTaskPlanModel implements Serializable {
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.modifyDatetimePlan = modifyDatetimePlan;
}
}

@ -55,6 +55,9 @@ public class MesEquTaskStandardModel implements Serializable {
@ApiParam("修改日期")
public String modifyDatetime;
@ApiParam("修改日期")
public String modifyDatetimeStandard;
@ApiParam("作业类型")
private String taskTypeName;
@ -66,7 +69,10 @@ public class MesEquTaskStandardModel implements Serializable {
}
public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem,
String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory,
String organizeCode, Integer isValid, Integer isDeleted, String createUser,
String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimeStandard) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
@ -83,5 +89,6 @@ public class MesEquTaskStandardModel implements Serializable {
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.modifyDatetimeStandard = modifyDatetimeStandard;
}
}

@ -102,6 +102,7 @@ public class MesEquipmentModel implements Serializable {
}
//根据条件查询设备所有有效数据-设备作业任务下拉框 queryMesEquipmentListByParams
public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) {
this.id = id;
this.equipmentCode = equipmentCode;
@ -111,6 +112,8 @@ public class MesEquipmentModel implements Serializable {
this.equipmentCategory = equipmentCategory;
}
//根据生产线,工位获取设备集合 findMesEquipmentList
//获取设备分页数据-组织模型 queryMesEquipmentByPagerOrg
public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) {
this.wcId = wcId;
this.id = id;
@ -122,6 +125,7 @@ public class MesEquipmentModel implements Serializable {
this.areaCode = areaCode;
}
//根据条件查询设备所有有效数据-组织模型下拉框及联 queryMesEquipmentList
public MesEquipmentModel(Long id, String equipmentNameAndworkCellName, String equipmentCode, String equipmentName, Integer status, String areaCode, String workCenterCode, String workCellCode) {
this.id = id;
this.equipmentNameAndworkCellName = equipmentNameAndworkCellName;
@ -134,13 +138,13 @@ public class MesEquipmentModel implements Serializable {
}
public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
//获取设备分页数据 queryMesEquipmentByPager
public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
this.status = status;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.areaCode = areaCode;
this.equipmentType = equipmentType;
this.equipmentCategory = equipmentCategory;

@ -102,10 +102,6 @@ public class MesHqlPack {
mesPlanOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
// 排序
DdlPreparedPack.getOrderDefault(mesPlanOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPlanOrder.getOrderByParam()}, packBean);
return packBean;
}
@ -141,8 +137,6 @@ public class MesHqlPack {
} else {
DdlPreparedPack.getStringNoEqualPack("WXJ", "produceCategoryCode", packBean);
}
DdlPreparedPack.getOrderDefault(mesPart);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean);
return packBean;
}
@ -205,7 +199,6 @@ public class MesHqlPack {
"createDatetime", packBean, true);
}
DdlPreparedPack.getOrderDefault(mesWorkOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
return packBean;
}
@ -243,8 +236,6 @@ public class MesHqlPack {
"createDatetime", packBean, true);
// DdlPreparedPack.getOrderDefault(mesQueueOrder);
// 按照队列序列号倒序
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{"seq"}, packBean);
return packBean;
}
@ -321,7 +312,6 @@ public class MesHqlPack {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesRoute, organizeCode);
DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean);
packBean.setOrderByStr(mesRoute.orderBy());
return packBean;
}
@ -337,7 +327,6 @@ public class MesHqlPack {
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
packBean.setOrderByStr(mesProdRouteCfg.orderBy());
return packBean;
}
@ -1163,8 +1152,6 @@ public class MesHqlPack {
if (null != numberRule.getIsCycle()) {
DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean);
}
packBean.setOrderByStr(numberRule.orderBy());
return packBean;
}
@ -1183,7 +1170,6 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesPcnTask.getTaskName())) {
DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
}
packBean.setOrderByStr(mesPcnTask.orderBy());
return packBean;
}
@ -1230,7 +1216,6 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(buttonStatus.getButtonCode())) {
DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean);
}
packBean.setOrderByStr(buttonStatus.orderBy());
return packBean;
}

@ -1,10 +1,13 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description : WMSmodel
* @Reference :
@ -16,33 +19,6 @@ import lombok.Data;
@Api("WMS列表菜单model")
public class WmsListElementModel extends BaseBean {
@ApiParam("字段名称")
private String fieldName;
@ApiParam("标题名称")
private String titleName;
@ApiParam("序列号:字段标题排序使用默认0不排序")
private Integer seq;
@ApiParam(value = "是否必选:默认1-必选2-非必选")
private Integer isRequire;
@ApiParam(value = "宽度")
private Double width;
@ApiParam(value = "排序规则:默认0-不排序1-升序2-降序")
private Integer sort;
@ApiParam(value = "是否加粗:默认1-加粗2-非加粗")
private Integer isWider;
@ApiParam(value = "是否勾选:默认1-勾选2-非勾选")
private Integer isSelect;
@ApiParam(value = "表单字段默认值")
private String defaultValue;
@ApiParam(value = "功能菜单ID")
private Long functionId;
@ -52,4 +28,6 @@ public class WmsListElementModel extends BaseBean {
@ApiParam(value = "是否默认配置")
private Integer isDefault;
List<WmsListElement> wmsListElementList;
}

@ -1,10 +1,13 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description : WMSmodel
* @Reference :
@ -16,21 +19,6 @@ import lombok.Data;
@Api("WMS列表搜索model")
public class WmsSearchElementModel extends BaseBean {
@ApiParam("字段名称")
private String fieldName;
@ApiParam("标题名称")
private String titleName;
@ApiParam(value = "条件表达式:>,<,>=等")
private String conditionExpre;
@ApiParam(value = "检索值")
private String value;
@ApiParam(value = "条件连接符:and/or")
private String conditionConnector;
@ApiParam(value = "功能菜单ID")
private Long functionId;
@ -46,6 +34,6 @@ public class WmsSearchElementModel extends BaseBean {
@ApiParam(value = "是否共享")
private Integer isShare;
@ApiParam(value = "搜索名称")
private String searchName;
@ApiParam(value = "Wms查询元素列表")
private List<WmsSearchElement> searchElementList;
}

@ -0,0 +1,92 @@
package cn.estsh.i3plus.pojo.wms.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 : gcj
* @CreateDate : 2020-01-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_PUSH_CONFIG")
@Api("推送配置")
public class WmsPushConfig extends BaseBean{
private static final long serialVersionUID = 2701710669030092153L;
@ApiParam("推送名称")
@Column(name = "PUSH_NAME")
private String pushName;
@ApiParam("规则类型")
@Column(name = "QUARTZ_CRON")
private String quartzCron;
@ApiParam("末次执行时间")
@Column(name = "LAST_EXE_TIME")
private String lastExeTime;
@ApiParam("下次执行时间")
@Column(name = "NEXT_EXE_TIME")
private String nextExeTime;
@ApiParam("序号")
@Column(name = "SERIAL_NUMBER")
private Integer serialNumber;
@ApiParam("查询Hql")
@Column(name = "HQL_STR")
private String hqlStr;
@ApiParam("查询Sql")
@Column(name = "SQL_STR")
private String sqlStr;
@ApiParam("脚本编号")
@Column(name = "SCRIPT_NO")
private String scriptNo;
@ApiParam("标题模板")
@Column(name = "TITLE_TEMPLATE")
private String titleTemplate;
@ApiParam("消息体模板")
@Column(name = "CONTENT_TEMPLATE")
private String contentTemplate;
@ApiParam("推送类型")
@Column(name = "PUSH_TYPE")
private Integer pushType;
@ApiParam("描述")
@Column(name = "REMARK")
private String remark;
@ApiParam("推送地址")
@Column(name ="PATH_URL")
private String pathUrl;
@ApiParam("头标签")
@Column(name = "TITLE_LABEL")
private String titleLabel;
@ApiParam("内容标签")
@Column(name = "CONTENT_LABEL")
private String contentLabel;
}

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.wms.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 : gcj
* @CreateDate : 2020-01-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_PUSH_LOG")
@Api("推送日志")
public class WmsPushLog extends BaseBean{
private static final long serialVersionUID = -1708833666516164845L;
@Column(name = "EXE_HQL")
@ApiParam("执行Hql")
private String exeHql;
@Column(name = "PUSH_TITLE")
@ApiParam("推送标题")
private String pushTitle;
@Column(name = "PUSH_CONTENT")
@ApiParam("推送内容")
private String pushContent;
@Column(name = "PUSH_TYPE")
@ApiParam("推送类型")
private String pushType;
@Column(name = "PUSH_RESULT")
@ApiParam("推送结果")
private String pushResult;
}

@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -20,7 +21,10 @@ import javax.persistence.Table;
**/
@Data
@Entity
@Table(name="WMS_FIELDINFO")
@Table(name="WMS_FIELDINFO", indexes = {
@Index(columnList = "FIELD_NAME"),
@Index(columnList = "ENTITY_NAME")
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -21,7 +22,10 @@ import javax.persistence.Table;
**/
@Data
@Entity
@Table(name="WMS_LISTELEMENT")
@Table(name="WMS_LISTELEMENT", indexes = {
@Index(columnList = "FIELD_NAME"),
@Index(columnList = "USER_CODE")
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -21,7 +22,11 @@ import javax.persistence.Table;
**/
@Data
@Entity
@Table(name="WMS_LISTELEMENT_FUNCTION")
@Table(name="WMS_LISTELEMENT_FUNCTION", indexes = {
@Index(columnList = "FUNCTION_ID"),
@Index(columnList = "ELEMENT_ID"),
@Index(columnList = "USER_CODE")
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)

@ -10,18 +10,23 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
* @Description : WMS
* @Reference :
* @Author : sjc
* @Author : siliter.yuan
* @CreateDate : 2020-01-07 09:06
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_SEARCHELEMENT")
@Table(name="WMS_SEARCHELEMENT", indexes = {
@Index(columnList = "FIELD_NAME"),
@Index(columnList = "SEARCH_NAME"),
@Index(columnList = "USER_CODE")
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@ -29,6 +34,7 @@ import javax.persistence.Table;
public class WmsSearchElement extends BaseBean {
private static final long serialVersionUID = 3903166651913139062L;
@Column(name = "FIELD_NAME")
@ApiParam(value = "字段名称")
private String fieldName;
@ -48,4 +54,12 @@ public class WmsSearchElement extends BaseBean {
@Column(name = "CONDITION_CONNECTOR")
@ApiParam(value = "条件连接符:and/or")
private String conditionConnector;
@Column(name = "SEARCH_NAME")
@ApiParam(value = "搜索名称")
private String searchName;
@Column(name = "USER_CODE")
@ApiParam(value = "用户编号")
private String userCode;
}

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -21,7 +22,12 @@ import javax.persistence.Table;
**/
@Data
@Entity
@Table(name="WMS_SEARCHELEMENT_FUNCTION")
@Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = {
@Index(columnList = "FUNCTION_ID"),
@Index(columnList = "SEARCH_ELEMENT_ID"),
@Index(columnList = "IS_SHARE"),
@Index(columnList = "USER_CODE")
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@ -29,6 +35,7 @@ import javax.persistence.Table;
public class WmsSearchElementFunction extends BaseBean {
private static final long serialVersionUID = 3903166651913139063L;
@Column(name = "FUNCTION_ID")
@ApiParam(value = "功能菜单ID")
private Long functionId;
@ -37,10 +44,6 @@ public class WmsSearchElementFunction extends BaseBean {
@ApiParam(value = "组名称")
private String groupName;
@Column(name = "SEARCH_NAME")
@ApiParam(value = "搜索名称")
private String searchName;
@Column(name = "SEARCH_ELEMENT_ID")
@ApiParam(value = "搜索元素ID")
private Long searchElementId;

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import lombok.Data;
import java.util.Map;
@Data
public class MailMessageModel extends PushMessageModel {
//附加value 文件的绝对地址/动态模板数据
private Map<String, Object> attachment;
}

@ -0,0 +1,25 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
public class PushMessageModel {
//标题
public String title;
//内容
public String content;
//推送类型
public String pushType;
//推送地址
public String pathUrl;
//推送数据
List<Map<Object,Object>> dataList;
}

@ -0,0 +1,19 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsPushConfig;
import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : gcj
* @CreateDate : 2020-01-06 9:47
* @Modify:
**/
@Repository
public interface WmsPushConfigRepository extends BaseRepository<WmsPushConfig, Long> {
}

@ -0,0 +1,18 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails;
import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2020-01-06 9:47
* @Modify:
**/
@Repository
public interface WmsPushLogRepository extends BaseRepository<WmsPushLog, Long> {
}

@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.wms.bean.*;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo;
import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
@ -2713,4 +2714,17 @@ public class WmsHqlPack {
return result;
}
/**
* WMS
*
* @param wmsFieldInfo
* @return
*/
public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result);
DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result);
getStringBuilderPack(wmsFieldInfo, result);
return result;
}
}

Loading…
Cancel
Save