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

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

Browse Source
yun-zuoyi
yunhao.wang 6 years ago
parent fa2303d838 2988f34bbd
commit 19a57e8c3e
13 changed files with 285 additions and 86 deletions
Show Stats Download Patch File Download Diff File

66
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java
Unescape Escape View File

@ -1,66 +0,0 @@
package cn.estsh.i3plus.pojo.mes;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-09-04 15:58
* @Modify:
**/
@Entity
@Table(name="machine_factory")
@Api("工厂")
public class MachineFactory extends BaseBean {
@Column(name="factory_code")
@ApiParam("工厂代码")
private String factoryCode;
@Column(name="factory_name")
@ApiParam("工厂名称")
private String factoryName;
public MachineFactory() {
}
public MachineFactory(String factoryCode, String factoryName) {
this.factoryCode = factoryCode;
this.factoryName = factoryName;
}
public String getFactoryCode() {
return factoryCode;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryName() {
return factoryName;
}
public void setFactoryName(String factoryName) {
this.factoryName = factoryName;
}
@Override
public String toString() {
return "MachineFactory{" +
"factoryCode='" + factoryCode + '\'' +
", factoryName='" + factoryName + '\'' +
", id=" + id +
", createDate='" + createDatetime + '\'' +
", modifyDate='" + modifyDatetime + '\'' +
'}';
}
}

20
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java
Unescape Escape View File

@ -1,20 +0,0 @@
package cn.estsh.i3plus.pojo.mes;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-09-04 15:58
* @Modify::
**/
public class WorkPlan {
private String desc;
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
}

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

@ -0,0 +1,73 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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 : Adair Peng
* @CreateDate : 2019-03-21 13:14
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BF_ELEMENT")
@Api(value = "对象元素基础", description = "元素基础表")
public class BfElement extends BaseBean {
//外键关联数据对象主键
@Column(name = "ELEMENT_INFO_ID")
@ApiParam(value = "对象元素明细ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementInfoId;
//外键关联数据对象主键
@Column(name = "DATA_OBJECT_ID")
@ApiParam(value = "数据对象ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long dataObjectId;
@Column(name="ELEMENT_TYPE")
@ApiParam(value ="元素类型")
private Integer elementType;
@Column(name="ELEMENT_NAME")
@ApiParam(value ="元素名称")
private String elementName;
@Column(name="ELEMENT_CODE")
@ApiParam(value ="元素编码")
private String elementCode;
@Column(name="ELEMENT_ATTR_ID")
@ApiParam(value ="默认排序属性")
private String elementAttrId;
@Column(name="ELEMENT_SORT_TYPE")
@ApiParam(value ="默认排序规则")
private String elementSortType;
@Column(name="ELEMENT_CSS_STYLE")
@ApiParam(value ="元素样式")
private String elementCssStyle;
@Column(name="ELEMENT_DESCRIPTION")
@ApiParam(value ="元素描述")
private String elementDescription;
}

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

@ -0,0 +1,38 @@
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.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :生产区域
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_AREA")
@Api("生产区域")
public class MesArea extends BaseBean {
@Column(name="AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name="AREA_NAME")
@ApiParam("区域名称")
private String areaName;
}

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

@ -0,0 +1,45 @@
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.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :工作单元
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL")
@Api("工作单元")
public class MesWorkCell extends BaseBean {
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CELL_NAME")
@ApiParam("工作单元名称")
private String workCellName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "AREA_CODE")
@ApiParam("生产区域代码")
private String areaCode;
}

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

@ -0,0 +1,49 @@
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.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :工作中心
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CENTER")
@Api("工作中心")
public class MesWorkCenter extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME")
@ApiParam("工作中心名称")
private String workCenterName;
@Column(name = "ERP_WORK_CENTER")
@ApiParam("ERP工作中心")
private String erpWorkCenter;
@Column(name = "WORK_VER")
@ApiParam("工作版本")
private String workVer;
@Column(name = "AREA_CODE")
@ApiParam("生产区域代码")
private String areaCode;
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.BfElement;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 15:24
* @Modify:
**/
public interface BfElementRepository extends BaseRepository<BfElement,Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesArea;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2018-11-07 14:49
* @Modify:
**/
@Repository
public interface MesAreaRepository extends BaseRepository<MesArea, Long> {
}

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

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesArea;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2018-11-07 14:49
* @Modify:
**/
@Repository
public interface MesWorkCellRepository extends BaseRepository<MesWorkCell, Long> {
}

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

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2018-11-07 14:49
* @Modify:
**/
@Repository
public interface MesWorkCenterRepository extends BaseRepository<MesWorkCenter, Long> {
}

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

@ -83,4 +83,8 @@ public class WmsDocMovementSn extends BaseBean {
@Transient
@ApiParam("生产日期")
public String dateCode;
@ApiParam(value = "散件移库输入移库数量")
@Transient
public Double inputMoveQty;
}

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

@ -56,6 +56,10 @@ public class WmsLocatePart extends BaseBean{
@ApiParam(value = "是否生成领料单", example = "2")
private Integer isGeneratePicklist;
public Double getMix() {
return this.min == null ? 0 : this.min;
}
public Integer getIsGeneratePicklist() {
return this.isGeneratePicklist == null ? 0 : this.isGeneratePicklist;
}

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

@ -57,10 +57,18 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
public Double getTransQty(){
return this.transQty == null ? 0 : this.transQty.doubleValue();
}
@Column(name="REJECT_QTY")
@ApiParam(value = "不合格处理数量", example = "0")
public Double rejectQty;
public Double getRejectQty(){
return this.rejectQty == null ? 0 : this.rejectQty.doubleValue();
}
@Column(name="UNIT")
@ApiParam("单位")
public String unit;

Write Preview
Loading…
Cancel
Save