yun-zuoyi
WYnneaoapc 5 years ago
commit b1d030e0dd

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -66,7 +67,7 @@ public abstract class BaseBean implements Serializable {
@Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
@ApiParam(value = "有效性",example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
public Integer isValid; //CommonEnumUtil.IS_VAILD;
@Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false)

@ -48,17 +48,17 @@ public class MesEnumUtil {
}
/**
* JIS
* JIS
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_SCAN_SEQ_TYPE {
ONE_PROD(10, "整发"),
MANY_PROD(20, "单发");
public enum MES_JIS_SCAN_TYPE {
TRUE(10, "是"),
FALSE(20, "否");
private int value;
private String description;
MES_JIS_SCAN_SEQ_TYPE(int value, String description) {
MES_JIS_SCAN_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -2620,6 +2620,7 @@ public class MesEnumUtil {
PUBLIC(10, "公用"),
JIT(20, "JIT生产"),
WORK_ORDER(30, "工单生产"),
JIS(40, "JIS发运"),
OTHER(99, "其他");
private int value;

@ -13,6 +13,112 @@ import org.apache.commons.lang3.StringUtils;
public class MesPcnEnumUtil {
/**
* JIS
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_PATTERN_TYPE {
ONE_PROD(10, "单产品发运"),
MANY_PROD(20, "多产品发运");
private int value;
private String description;
MES_JIS_PATTERN_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;
}
}
/**
* JIS
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_SCAN_TYPE {
TRUE(10, "是"),
FALSE(20, "否");
private int value;
private String description;
MES_JIS_SCAN_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;
}
}
/**
* JIS
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_QUEUE_JIS_STATUS {
TRUE(10, "已发运"),
FALSE(20, "未发运");
private int value;
private String description;
MES_QUEUE_JIS_STATUS(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;
}
}
/**
* MesMethodmethodType
* 10.
*/
@ -132,7 +238,9 @@ public class MesPcnEnumUtil {
PCN_MODULE(180, "PCN_MODULE", ""),
PCN_LOGOUT(190, "PCN_LOGOUT", ""),
UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"),
PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");
PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"),
PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE");
private int value;
private String code;

@ -33,58 +33,4 @@ public class StringUtil {
}
return fieldNames;
}
/**
*
* @param clazz
* @return
*/
public static List<String> getFieldList(Class clazz) {
Field[] fields = clazz.getDeclaredFields();
Field[] superFields = clazz.getSuperclass().getDeclaredFields();
List<String> fieldNames = new ArrayList<>();
for(int i = 0;i < fields.length; i++){
fieldNames.add(fields[i].getName());
}
for(int i = 0;i < superFields.length; i++){
fieldNames.add(superFields[i].getName());
}
return fieldNames;
}
/**
*
* @param fieldName
* @param o
* @return
*/
public static Object getFieldValueByName(String fieldName, Object o) {
try {
String firstLetter = fieldName.substring(0, 1).toUpperCase();
String getter = "get" + firstLetter + fieldName.substring(1);
Method method = o.getClass().getMethod(getter, new Class[] {});
Object value = method.invoke(o, new Object[] {});
return value;
} catch (Exception e) {
return null;
}
}
private static Pattern linePattern = Pattern.compile("_(\\w)");
/** 驼峰转下划线 */
public static Map<String, Object> humpToLine(Map<String, Object> map) {
Map<String, Object> resultMap = new HashMap<>();
for (String str : map.keySet()) {
str = str.toLowerCase();
Matcher matcher = linePattern.matcher(str);
StringBuffer sb = new StringBuffer();
while (matcher.find()) {
matcher.appendReplacement(sb, matcher.group(1).toUpperCase());
}
matcher.appendTail(sb);
resultMap.put(sb.toString(), map.get(str));
}
return resultMap;
}
}

@ -0,0 +1,64 @@
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;
/**
* @Description :JIS
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-12-25
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PATTERN_JIS")
@Api("JIS发运模式")
public class MesPatternJis extends BaseBean {
@Column(name = "PATTERN_NO")
@ApiParam("模式编号")
private String patternNo;
@Column(name = "PATTERN_NAME")
@ApiParam("模式名称")
private String patternName;
@Column(name = "RULE")
@ApiParam("规则")
private String rule;
@Column(name = "PATTERN_DESC")
@ApiParam("描述")
private String patternDesc;
@Column(name = "TOP_NO")
@ApiParam("一次显示TOP数")
private Integer topNo;
@Column(name = "HANDLE_NO")
@ApiParam("一次处理套数")
private Integer handleNo;
@Column(name = "PATTERN_TYPE")
@ApiParam("模式类型")
private Integer patternType;
@Column(name = "SCAN_TYPE")
@ApiParam("是否按主队列顺序扫描")
private Integer scanType;
}

@ -0,0 +1,51 @@
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 : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_CFG_DETAIL")
@Api("产品配置明细")
public class MesProdCfgDetail extends BaseBean {
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "IS_VIRTUAL")
@ApiParam("是否虚零件")
private Integer isVirtual;
@Transient
@ApiParam("零件名称")
private String partName;
public int getIsVirtualVal() {
return this.isVirtual == null ? 0 : this.isVirtual;
}
}

@ -0,0 +1,38 @@
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;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-26-10:25
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_CATEGORY")
@Api("系统业务动作")
public class MesProduceCategory extends BaseBean {
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码")
private String produceCategoryCode;
@Column(name = "PRODUCE_CTGY_NAME")
@ApiParam("产品类型名称")
private String produceCategoryName;
}

@ -0,0 +1,64 @@
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;
/**
* @Description :JIS
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-12-24
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_JIS")
@Api("JIS发运队列")
public class MesQueueJis extends BaseBean {
@Column(name = "JIS_NO")
@ApiParam("主队列编号")
private String jisNo;
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "CAR_NO")
@ApiParam("车号")
private String carNo;
@Column(name = "SEQ")
@ApiParam("排序")
private Double seq;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
}

@ -0,0 +1,56 @@
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;
/**
* @Description :JIS
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-12-24
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_JIS_DETAIL")
@Api("JIS发运队列明细")
public class MesQueueJisDetail extends BaseBean {
@Column(name = "JIS_NO")
@ApiParam("主队列编号")
private String jisNo;
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
}

@ -0,0 +1,60 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
@Data
public class QueueJisModel implements Serializable {
@ApiParam("主队列编号")
private String jisNo;
@ApiParam("vin")
private String vinCode;
@ApiParam("车号")
private String carNo;
@ApiParam("排序")
private Double seq;
@ApiParam("状态")
private Integer status;
@ApiParam("产品配置代码")
private String prodCfgCode;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("产品类型代码")
private String produceCategoryCode;
@ApiParam("明细状态")
private Integer detailStatus;
@ApiParam("产品条码")
private String serialNumber;
public QueueJisModel() {
}
public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber) {
this.jisNo = jisNo;
this.vinCode = vinCode;
this.carNo = carNo;
this.seq = seq;
this.status = status;
this.prodCfgCode = prodCfgCode;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.produceCategoryCode = produceCategoryCode;
this.detailStatus = detailStatus;
this.serialNumber = serialNumber;
}
}

@ -17,6 +17,7 @@ import java.io.Serializable;
@Data
@Api("JIT队列列表Model")
public class QueueOrderModel implements Serializable {
private Long id;
@ApiParam("队列序号")
public Double queueSeq;
@ApiParam("队列明细序号")
@ -52,8 +53,9 @@ public class QueueOrderModel implements Serializable {
public QueueOrderModel() {
}
public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;

@ -0,0 +1,16 @@
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.MesPatternJis;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-12-25
* @Modify:
**/
@Repository
public interface MesPatternJisRepository extends BaseRepository<MesPatternJis, Long> {
}

@ -0,0 +1,16 @@
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.MesProdCfgDetail;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesProdCfgDetailRepository extends BaseRepository<MesProdCfgDetail, Long> {
}

@ -0,0 +1,16 @@
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.MesProduceCategory;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-26-10:28
* @Modify:
**/
@Repository
public interface MesProduceCategoryRepository extends BaseRepository<MesProduceCategory, Long> {
}

@ -0,0 +1,16 @@
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.MesQueueJisDetail;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-12-25
* @Modify:
**/
@Repository
public interface MesQueueJisDetailRepository extends BaseRepository<MesQueueJisDetail, Long> {
}

@ -0,0 +1,16 @@
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.MesQueueJis;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-12-25
* @Modify:
**/
@Repository
public interface MesQueueJisRepository extends BaseRepository<MesQueueJis, Long> {
}

@ -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;
/**
@ -25,9 +26,9 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_JIS_PATTERN")
@Table(name = "MES_PATTERN_JIS")
@Api("JIS发运模式")
public class MesJisPattern extends BaseBean {
public class MesPatternJis extends BaseBean {
@Column(name = "PATTERN_NO")
@ApiParam("模式编号")
@ -37,13 +38,14 @@ public class MesJisPattern extends BaseBean {
@ApiParam("模式名称")
private String patternName;
@Lob
@Column(name = "RULE")
@ApiParam("规则")
private String rule;
@Column(name = "DESC")
@Column(name = "PATTERN_DESC")
@ApiParam("描述")
private String desc;
private String patternDesc;
@Column(name = "TOP_NO")
@ApiParam("一次显示TOP数")
@ -57,8 +59,8 @@ public class MesJisPattern extends BaseBean {
@ApiParam("模式类型")
private Integer patternType;
@Column(name = "SCAN_SEQ_TYPE")
@ApiParam("产品组扫描顺序类型")
private Integer scanSeqType;
@Column(name = "SCAN_TYPE")
@ApiParam("是否按主队列顺序扫描")
private Integer scanType;
}

@ -53,4 +53,12 @@ public class MesQueueJis extends BaseBean {
@ApiParam("状态")
private Integer status;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
}

@ -1,100 +0,0 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
@Data
public class QueueJisModel implements Serializable {
@ApiParam("id")
private Long id;
@ApiParam("作业任务编号")
private String taskNo;
@ApiParam("作业类型")
private Integer taskType;
@ApiParam("作业状态")
private Integer taskStatus;
@ApiParam(value="生产线")
private String workCenterCode;
@ApiParam("计划日期")
private String planTime;
@ApiParam("任务来源")
private Integer taskSource;
@ApiParam("备注")
private String memo;
@ApiParam("通知标识")
private Integer notifyFlag;
@ApiParam("关联任务")
private String relateTask;
@ApiParam("组织代码")
public String organizeCode;
@ApiParam("有效性")
public Integer isValid;
@ApiParam("是否已删除")
public Integer isDeleted;
@ApiParam("创建用户")
public String createUser;
@ApiParam("创建日期")
public String createDatetime;
@ApiParam("修改人")
public String modifyUser;
@ApiParam("修改日期")
public String modifyDatetime;
@ApiParam("作业类型")
private String taskTypeName;
@ApiParam("作业状态")
private String taskStatusName;
@ApiParam("任务来源")
private String taskSourceName;
@ApiParam("通知标识")
private String notifyFlagName;
@ApiParam("mes设备作业任务页面按钮控制")
private MesButtonFlagModel mesButtonFlagModel;
public QueueJisModel() {
}
public QueueJisModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
this.id = id;
this.taskNo = taskNo;
this.taskType = taskType;
this.taskStatus = taskStatus;
this.workCenterCode = workCenterCode;
this.planTime = planTime;
this.taskSource = taskSource;
this.memo = memo;
this.notifyFlag = notifyFlag;
this.relateTask = relateTask;
this.organizeCode = organizeCode;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
}

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesJisPattern;
import cn.estsh.i3plus.pojo.mes.bean.MesPatternJis;
import org.springframework.stereotype.Repository;
/**
@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
* @Modify:
**/
@Repository
public interface MesJisPatternRepository extends BaseRepository<MesJisPattern, Long> {
public interface MesPatternJisRepository extends BaseRepository<MesPatternJis, Long> {
}

@ -1388,7 +1388,7 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean);
}
if (null == mesQcCheckStandard.getCheckType()) {
if (mesQcCheckStandard.getCheckType() != null) {
DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) {
@ -1483,7 +1483,7 @@ public class MesHqlPack {
public static DdlPackBean getMesTypeCfg(MesTypeCfg mesTypeCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesTypeCfg, organizeCode);
if (!StringUtils.isEmpty(mesTypeCfg.getTypeCode())) {
DdlPreparedPack.getStringLikerPack(mesTypeCfg.getTypeCode(), "typeCode", packBean);
DdlPreparedPack.getStringEqualPack(mesTypeCfg.getTypeCode(), "typeCode", packBean);
}
if (!StringUtils.isEmpty(mesTypeCfg.getBusinessTypeCode())) {
DdlPreparedPack.getStringLikerPack(mesTypeCfg.getBusinessTypeCode(), "businessTypeCode", packBean);
@ -2100,26 +2100,23 @@ public class MesHqlPack {
/**
* JIS
* @param jisPattern
* @param patternJis
* @param organizeCode
* @return
*/
public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode);
if (!StringUtils.isEmpty(jisPattern.getPatternNo())) {
DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean);
public static DdlPackBean getPatternJisCondition(MesPatternJis patternJis, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(patternJis, organizeCode);
if (!StringUtils.isEmpty(patternJis.getPatternNo())) {
DdlPreparedPack.getStringLikerPack(patternJis.getPatternNo(), "patternNo", packBean);
}
if (!StringUtils.isEmpty(jisPattern.getTopNo())) {
DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean);
if (!StringUtils.isEmpty(patternJis.getTopNo())) {
DdlPreparedPack.getNumEqualPack(patternJis.getTopNo(), "topNo", packBean);
}
if (!StringUtils.isEmpty(jisPattern.getHandleNo())) {
DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean);
if (!StringUtils.isEmpty(patternJis.getHandleNo())) {
DdlPreparedPack.getNumEqualPack(patternJis.getHandleNo(), "handleNo", packBean);
}
if (!StringUtils.isEmpty(jisPattern.getPatternType())) {
DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean);
}
if (!StringUtils.isEmpty(jisPattern.getScanSeqType())) {
DdlPreparedPack.getNumEqualPack(jisPattern.getScanSeqType(), "scanSeqType", packBean);
if (!StringUtils.isEmpty(patternJis.getPatternType())) {
DdlPreparedPack.getNumEqualPack(patternJis.getPatternType(), "patternType", packBean);
}
return packBean;
}

@ -75,6 +75,12 @@ public class WmsActionGroup extends BaseBean {
@AnnoOutputColumn
private Integer isCommitRefMove;
// 1=true, 2 = false
@Column(name = "IS_AUTO_COMMIT", nullable = false)
@ApiParam(value = "是否自动提交", example = "1")
@AnnoOutputColumn
private Integer isAutoCommit;
@Lob
@Column(name = "POSITION")
@ApiParam(value = "GOJS位置")
@ -99,6 +105,11 @@ public class WmsActionGroup extends BaseBean {
public int getIsCommitRefMoveVal() {
return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue();
}
public int getIsAutoCommitVal() {
return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue();
}
public int getAutoInitVal() {
return this.autoInit == null ? 0 : this.autoInit.intValue();
}

@ -0,0 +1,51 @@
package cn.estsh.i3plus.pojo.wms.bean.dynamic;
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 : WMS
* @Reference :
* @Author : sjc
* @CreateDate : 2020-01-07 09:06
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_FIELDINFO")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="WMS字段信息表",description = "WMS字段信息表")
public class WmsFieldInfo extends BaseBean {
private static final long serialVersionUID = 3903166651913139064L;
@Column(name = "FIELD_NAME")
@ApiParam(value = "字段名称")
private String fieldName;
@Column(name = "FIELD_DESC")
@ApiParam(value = "字段描述")
private String fieldDesc;
@Column(name = "FIELD_TYPE")
@ApiParam(value = "字段类型")
private String fieldType;
@Column(name = "ENTITY_NAME")
@ApiParam(value = "实体名称")
private String entityName;
@Column(name = "ENTITY_DESC")
@ApiParam(value = "实体描述")
private String entityDesc;
}

@ -0,0 +1,75 @@
package cn.estsh.i3plus.pojo.wms.bean.dynamic;
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 : WMS
* @Reference :
* @Author : sjc
* @CreateDate : 2020-01-07 09:06
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_LISTELEMENT")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="WMS列表元素表",description = "WMS列表元素表")
public class WmsListElement extends BaseBean {
private static final long serialVersionUID = 3903166651913139060L;
@Column(name = "FIELD_NAME")
@ApiParam(value = "字段名称")
private String fieldName;
@Column(name = "TITLE_NAME")
@ApiParam(value = "标题名称")
private String titleName;
@Column(name = "SEQ")
@ApiParam(value = "序列号:字段标题排序使用默认0不排序")
private Integer seq;
@Column(name = "IS_REQUIRE")
@ApiParam(value = "是否必选:默认1-必选2-非必选")
private Integer isRequire;
@Column(name = "WIDTH", columnDefinition = "decimal(2,5)")
@ApiParam(value = "宽度", example = "0")
private Double width;
public Double getWidth() {
return this.width == null ? 0 : this.width.doubleValue();
}
@Column(name = "SORT")
@ApiParam(value = "排序规则:默认0-不排序1-升序2-降序")
private Integer sort;
@Column(name = "IS_WIDER")
@ApiParam(value = "是否加粗:默认1-加粗2-非加粗")
private Integer isWider;
@Column(name = "IS_SELECT")
@ApiParam(value = "是否勾选:默认1-勾选2-非勾选")
private Integer isSelect;
@Column(name = "ISSHOW")
@ApiParam(value = "是否表单字段展示:默认1-显示2-隐藏")
private Integer isShow;
@Column(name = "DEFAULT_VALUE")
@ApiParam(value = "表单字段默认值")
private String defaultValue;
}

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.wms.bean.dynamic;
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 : WMS
* @Reference :
* @Author : sjc
* @CreateDate : 2020-01-07 09:06
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_LISTELEMENT_FUNCTION")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="WMS列表元素菜单关系表",description = "WMS列表元素菜单关系表")
public class WmsListElementFunction extends BaseBean {
private static final long serialVersionUID = 3903166651913139061L;
@Column(name = "FUNCTION_ID")
@ApiParam(value = "功能菜单ID")
private Long functionId;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "元素ID")
private Long elementId;
@Column(name = "USER_CODE")
@ApiParam(value = "用户编号")
private String userCode;
@Column(name = "IS_DEFAULT")
@ApiParam(value = "是否默认配置")
private Integer isDefault;
}

@ -0,0 +1,51 @@
package cn.estsh.i3plus.pojo.wms.bean.dynamic;
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 : WMS
* @Reference :
* @Author : sjc
* @CreateDate : 2020-01-07 09:06
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_SEARCHELEMENT")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="WMS搜索元素表",description = "WMS搜索元素表")
public class WmsSearchElement extends BaseBean {
private static final long serialVersionUID = 3903166651913139062L;
@Column(name = "FIELD_NAME")
@ApiParam(value = "字段名称")
private String fieldName;
@Column(name = "TITLE_NAME")
@ApiParam(value = "标题名称")
private String titleName;
@Column(name = "CONDITION_EXPRE")
@ApiParam(value = "条件表达式:>,<,>=等")
private String conditionExpre;
@Column(name = "VALUE")
@ApiParam(value = "检索值")
private String value;
@Column(name = "CONDITION_CONNECTOR")
@ApiParam(value = "条件连接符:and/or")
private String conditionConnector;
}

@ -0,0 +1,55 @@
package cn.estsh.i3plus.pojo.wms.bean.dynamic;
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 : WMS
* @Reference :
* @Author : sjc
* @CreateDate : 2020-01-07 09:06
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_SEARCHELEMENT_FUNCTION")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="WMS搜索元素菜单关系表",description = "WMS搜索元素菜单关系表")
public class WmsSearchElementFunction extends BaseBean {
private static final long serialVersionUID = 3903166651913139063L;
@Column(name = "FUNCTION_ID")
@ApiParam(value = "功能菜单ID")
private Long functionId;
@Column(name = "GROUP_NAME")
@ApiParam(value = "组名称")
private String groupName;
@Column(name = "SEARCH_ELEMENT_ID")
@ApiParam(value = "搜索元素ID")
private Long searchElementId;
@Column(name = "GROUP_CONNECTOR")
@ApiParam(value = "组条件连接符")
private String groupConnector;
@Column(name = "USER_CODE")
@ApiParam(value = "用户编号")
private String userCode;
@Column(name = "IS_SHAER")
@ApiParam(value = "是否共享")
private Integer isShaer;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo;
import org.springframework.stereotype.Repository;
/**
* @Description : WMS
* @Reference :
* @Author : sjc
* @CreateDate : 2020-01-07 11:30
* @Modify:
**/
@Repository
public interface WmsFieldInfoRepository extends BaseRepository<WmsFieldInfo, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElementFunction;
import org.springframework.stereotype.Repository;
/**
* @Description : WMS
* @Reference :
* @Author : sjc
* @CreateDate : 2020-01-07 11:30
* @Modify:
**/
@Repository
public interface WmsListElementFunctionRepository extends BaseRepository<WmsListElementFunction, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement;
import org.springframework.stereotype.Repository;
/**
* @Description : WMS
* @Reference :
* @Author : sjc
* @CreateDate : 2020-01-07 11:30
* @Modify:
**/
@Repository
public interface WmsListElementRepository extends BaseRepository<WmsListElement, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction;
import org.springframework.stereotype.Repository;
/**
* @Description : WMS
* @Reference :
* @Author : sjc
* @CreateDate : 2020-01-07 11:30
* @Modify:
**/
@Repository
public interface WmsSearchElementFunctionRepository extends BaseRepository<WmsSearchElementFunction, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement;
import org.springframework.stereotype.Repository;
/**
* @Description : WMS
* @Reference :
* @Author : sjc
* @CreateDate : 2020-01-07 11:30
* @Modify:
**/
@Repository
public interface WmsSearchElementRepository extends BaseRepository<WmsSearchElement, Long> {
}
Loading…
Cancel
Save