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

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

Browse Source
yun-zuoyi
许心洁 4 years ago
parent 38e6870f04 339cbf0634
commit 2127e3d260
14 changed files with 215 additions and 72 deletions
Show Stats Download Patch File Download Diff File

47
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java
Unescape Escape View File

@ -1,47 +0,0 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 java.io.Serializable;
/**
* @Description:
* @CreateDate: 2020/10/13
* @Author: simon.song
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_BOARD_IMAGE")
@Api("MES_看板图片")
public class MesBoardImage extends BaseBean implements Serializable {
private static final long serialVersionUID = -3511836584646450267L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "IMAGE_URL")
@ApiParam("图片路径")
private String imageUrl;
}

12
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java
Unescape Escape View File

@ -76,4 +76,16 @@ public class MesNumberRule extends BaseBean implements Serializable {
@ApiParam("拼接固定字符,多个逗号分隔")
private String spiltRule;
public Integer getBeginVal() {
return this.beginVal == null ? 1 : this.beginVal;
}
public Integer getSerialnoIncrement() {
return this.serialnoIncrement == null ? 1 : this.serialnoIncrement;
}
public Integer getSerialnoLength() {
return this.serialnoLength == null ? 1 : this.serialnoLength;
}
}

12
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
Unescape Escape View File

@ -236,6 +236,18 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("物料版本号")
private String versionNo;
@Transient
@ApiParam("配方内容")
private String formulaContent;
@Transient
@ApiParam("分组队列编号")
private String queueGroupNo;
@Transient
@ApiParam("组内编号")
private Integer groupNo;
public MesProduceSn() {
}

11
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
Unescape Escape View File

@ -8,12 +8,7 @@ import org.hibernate.annotations.ColumnDefault;
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.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -74,4 +69,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
@Column(name = "PART_COLOR_VALUE")
@ApiParam("零件色值")
private String partColorValue;
@Transient
@ApiParam("物料名称")
private String partName;
}

148
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java
Unescape Escape View File

@ -0,0 +1,148 @@
package cn.estsh.i3plus.pojo.mes.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.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-16-17:36
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_QUEUE_ORDER_DETAIL_RECORD", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "QUEUE_GROUP_NO"),
@Index(columnList = "PRODUCE_CATEGORY_CODE")
})
@Api("生产队列明细记录表")
public class MesQueueOrderDetailRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 7840873844253353896L;
@Column(name = "ORDER_NO")
@ApiParam("主队列编号")
private String orderNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "SEQ", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("队列明细序号")
private Double seq;
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "WORK_TYPE")
@ApiParam("生产类型")
private String workType;
@Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品位置")
private String produceCategoryCode;
@Column(name = "PRODUCE_CATEGORY_NAME_RDD")
@ApiParam("产品位置名称")
private String produceCategoryNameRdd;
@Column(name = "PPT_CODE")
@ApiParam("产品类型名称")
private String pptCode;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@Column(name = "GROUP_NO")
@ApiParam("组内编号")
private Integer groupNo;
@Column(name = "IS_GROUP_PRINTED")
@ApiParam("料架是否已打印")
private Integer isGroupPrinted = 2;
@Column(name = "PRODUCE_COLOR")
@ApiParam("产品颜色")
private String produceColor;
@Column(name = "PRODUCE_COLOR_CODE")
@ApiParam("产品颜色代码")
private String produceColorCode;
@Column(name = "OPTION_CODE")
@ApiParam("选项代码")
private String optionCode;
@Column(name = "ASSY_NO")
@ApiParam("组件编号")
private String assyNo;
@Column(name = "FORMULA_CONTENT")
@ApiParam("配方内容")
private String formulaContent;
@Column(name = "FINSIH_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("已生产数量")
private Double finsihQty;
@Column(name = "GROUP_SIDE")
@ApiParam("料架摆放位置")
private String groupSide;
@Column(name = "GROUP_SEQ")
@ApiParam("分组序号")
private String groupSeq;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "IS_EMPTY")
@ApiParam("是否放空")
private Integer isEmpty;
@Column(name = "JIS_BACKFLUSH_STATUS")
@ApiParam("回冲标识")
private String jisBackflushStatus;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
}

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

@ -115,9 +115,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
public MesStateMachineStatus() {
}
public MesStateMachineStatus(String smCode, String statusCode, String nextStatus, String statusName, String nextStatusName, Integer triggerType,
public MesStateMachineStatus(Long id, String smCode, String statusCode, String nextStatus, String statusName, String nextStatusName, Integer triggerType,
String triggerEvent, String triggerWhere, Long triggerAmgId, Long inAmgId, Long outAmgId, Integer statusType, Integer seq,
Integer isInit, String routeCode, String processCode) {
this.id = id;
this.smCode = smCode;
this.statusCode = statusCode;
this.nextStatus = nextStatus;

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java
Unescape Escape View File

@ -20,6 +20,8 @@ public class SnPrintDataModel {
@ApiParam("打印数据")
private List<StepPrintSnModel> valueList;
@ApiParam("打印数据")
private List<StepPrintSnModel> templateData;
@ApiParam("打印模板及参数")
private MesLabelTemplate labelTemplate;

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.java
Unescape Escape View File

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardImage;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @CreateDate: 2020/10/13
* @Author: simon.song
*/
@Repository
public interface MesBoardImageRepository extends BaseRepository<MesBoardImage, Long> {
}

13
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderDetailRecordRepository.java
Unescape Escape View File

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderDetailRecord;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/2/26 10:18 AM
* @Modify:
*/
public interface MesQueueOrderDetailRecordRepository extends BaseRepository<MesQueueOrderDetailRecord, Long> {
}

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

@ -1906,6 +1906,9 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) {
DdlPreparedPack.getStringLikerPack(mesDataObject.getFieldPk(), "fieldPk", packBean);
}
if (!StringUtils.isEmpty(mesDataObject.getDsCode())) {
DdlPreparedPack.getStringLikerPack(mesDataObject.getDsCode(), "dsCode", packBean);
}
return packBean;
}
@ -2120,7 +2123,7 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) {
DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean);
DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
Unescape Escape View File

@ -486,6 +486,11 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("项目名称")
String prodCfgTypeName;
@Transient
@ApiParam("完成时间")
public String complateDateTime;

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
Unescape Escape View File

@ -377,4 +377,9 @@ public class WmsMoveMaster extends BaseBean {
public int getBusiTypeCodeVal() {
return this.busiTypeCode == null ? 0 : this.busiTypeCode.intValue();
}
public WmsMoveMaster(String createDatetime, String createUser) {
this.createDatetime = createDatetime;
this.createUser = createUser;
}
}

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java
Unescape Escape View File

@ -7,18 +7,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
/**
* @Description : 零件装换信息
* @Description : 零件转换信息
* @Reference :
* @Author : puxiao.liao
* @CreateDate : 2020-08-19 14:50

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
Unescape Escape View File

@ -243,6 +243,10 @@ public class WmsStockQuan extends BaseBean {
return this.lockVersion == null ? 0 : this.lockVersion;
}
public boolean getShowNoDiffStock() {
return this.showNoDiffStock == null ? false : this.showNoDiffStock;
}
public WmsStockQuan() {
}

Write Preview
Loading…
Cancel
Save