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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
许心洁 5 years ago
parent 7d63a933c0 bf62494236
commit a2041a4900
12 changed files with 153 additions and 26 deletions
Show Stats Download Patch File Download Diff File

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

@ -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)

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

@ -2620,6 +2620,7 @@ public class MesEnumUtil {
PUBLIC(10, "公用"),
JIT(20, "JIT生产"),
WORK_ORDER(30, "工单生产"),
JIS(40, "JIS发运"),
OTHER(99, "其他");
private int value;

8
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java
Unescape Escape View File

@ -25,9 +25,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("模式编号")
@ -41,9 +41,9 @@ public class MesJisPattern extends BaseBean {
@ApiParam("规则")
private String rule;
@Column(name = "DESC")
@Column(name = "PATTERN_DESC")
@ApiParam("描述")
private String desc;
private String patternDesc;
@Column(name = "TOP_NO")
@ApiParam("一次显示TOP数")

51
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java
Unescape Escape View File

@ -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;
}
}

38
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java
Unescape Escape View File

@ -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;
}

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
Unescape Escape View File

@ -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;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
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.MesJisPattern;
import cn.estsh.i3plus.pojo.mes.pcn.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> {
}

16
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java
Unescape Escape View File

@ -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> {
}

16
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java
Unescape Escape View File

@ -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> {
}

10
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java
Unescape Escape View File

@ -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数")

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java
Unescape Escape View File

@ -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> {
}

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

@ -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,23 +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(patternJis.getPatternType())) {
DdlPreparedPack.getNumEqualPack(patternJis.getPatternType(), "patternType", packBean);
}
return packBean;
}

Write Preview
Loading…
Cancel
Save