注塑 组装报表开发完毕

yun-zuoyi
wynne1005 5 years ago
parent 1730dc27c3
commit 6d4e8608c4

@ -1,11 +1,12 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -28,6 +29,8 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_PRODUCT_OFF_LINE")
@NoArgsConstructor
@AllArgsConstructor
@Api("生产报工表")
public class IfProductOffLine extends BaseBean implements Serializable {
@ -153,4 +156,12 @@ public class IfProductOffLine extends BaseBean implements Serializable {
@Column(name = "BASE_MODULE")
@ApiParam("BaseModule零件号")
private String baseModule;
public IfProductOffLine(String partNo, String packageNo, Double qty, String workCenterCode, Integer qcStatus) {
this.partNo = partNo;
this.packageNo = packageNo;
this.qty = qty;
this.workCenterCode = workCenterCode;
this.qcStatus = qcStatus;
}
}

@ -0,0 +1,53 @@
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;
import java.io.Serializable;
/**
* @Description : MES_
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_LINE_COORDS_MATRIX")
@Api("MES_看板产线坐标")
public class MesBoardLineCoordsMatrix extends BaseBean implements Serializable {
private static final long serialVersionUID = -7823702941907604215L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线代码")
private String workCenterCode;
@Column(name = "X_AXIS")
@ApiParam("X坐标")
private String xAxis;
@Column(name = "Y_AXIS")
@ApiParam("Y坐标")
private String yAxis;
}

@ -0,0 +1,73 @@
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;
import java.io.Serializable;
/**
* @Description : MES_
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_LINE_MATRIX")
@Api("MES_看板产线矩阵")
public class MesBoardLineMatrix extends BaseBean implements Serializable {
private static final long serialVersionUID = 4414374274261870347L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线代码")
private String workCenterCode;
@Column(name = "PICTURE_URL")
@ApiParam("产线图片路径")
private String pictureUrl;
@Column(name = "USER_FIRST")
@ApiParam("用户编号1")
private String userFirst;
@Column(name = "USER_SECOND")
@ApiParam("用户编号2")
private String userSecond;
@Column(name = "USER_THIRD")
@ApiParam("用户编号3")
private String userThird;
@Column(name = "USER_FORTH")
@ApiParam("用户编号4")
private String userForth;
@Column(name = "USER_FIFTH")
@ApiParam("用户编号5")
private String userFifth;
@Column(name = "USER_SIXTH")
@ApiParam("用户编号6")
private String userSixth;
}

@ -0,0 +1,61 @@
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;
import java.io.Serializable;
/**
* @Description : MES_
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_LINE_STAFF_MATRIX")
@Api("MES_看板产线员工能力矩阵")
public class MesBoardLineStaffMatrix extends BaseBean implements Serializable {
private static final long serialVersionUID = 1889056360071546259L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位代码")
private String workCellCode;
@Column(name = "USER_CODE")
@ApiParam("员工编号")
private String userCode;
@Column(name = "X_AXIS")
@ApiParam("X坐标")
private Double xAxis;
@Column(name = "Y_AXIS")
@ApiParam("Y坐标")
private Double yAxis;
}

@ -0,0 +1,43 @@
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;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/10/27 13:29
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_LINE_FAULT_RECORD")
@Api("产线故障记录表")
public class MesLineFaultRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 6108659377329720059L;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "EQU_NAME")
@ApiParam("设备名称")
private String equName;
@Column(name = "FAULT_TIME")
@ApiParam("故障时长(分)")
private Double faultTime;
}

@ -0,0 +1,58 @@
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;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_STAFF")
@Api("员工信息")
public class MesStaff extends BaseBean implements Serializable {
private static final long serialVersionUID = -8330599945613548761L;
@Column(name = "USER_CODE")
@ApiParam("员工编号")
private String userCode;
@Column(name = "USER_NAME")
@ApiParam("姓名")
private String userName;
@Column(name = "PICTURE_URL")
@ApiParam("照片路径")
private String pictureUrl;
@Column(name = "SKILL_LEVEL")
@ApiParam("技能等级")
private Integer skillLevel;
@Transient
private Double xAxis;
@Transient
private Double yAxis;
@Transient
private String workCellCode;
}

@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @Description:
@ -387,6 +386,11 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("已报工数量")
private Integer productOffLineQty;
@Transient
@ApiParam("生产节拍")
private Integer takt;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
@ -419,10 +423,11 @@ public class MesWorkOrder extends BaseBean implements Serializable {
return this.approvalStatus == null ? 0 : this.approvalStatus;
}
public MesWorkOrder(){}
public MesWorkOrder() {
}
public MesWorkOrder(String orderNo,String startTime,String workCenterCode,Double qty,
String partNo,String partNameRdd,String itemPartNo,Double itemQty){
public MesWorkOrder(String orderNo, String startTime, String workCenterCode, Double qty,
String partNo, String partNameRdd, String itemPartNo, Double itemQty) {
this.orderNo = orderNo;
this.startTime = startTime;
this.workCenterCode = workCenterCode;

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamImplicit;

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
import lombok.Data;
import lombok.NoArgsConstructor;

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import io.swagger.annotations.ApiParam;

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;

@ -1,11 +1,10 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**

@ -0,0 +1,20 @@
package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
import lombok.Data;
/**
* @author Wynne.Lu
* @date 2020/10/28 17:30
* @desc
*/
@Data
public class AndonModel {
private String workCenterCode;
private Double xAxis;
private Double yAxis;
private String expInfo;
}

@ -0,0 +1,22 @@
package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
import lombok.Data;
import java.util.Map;
/**
* @author Wynne.Lu
* @date 2020/10/28 13:47
* @desc
*/
@Data
public class DefectModel {
private String workCenterCode;
private Map<String, Double> percents;
private Integer total;
private String queryBeginTime;
}

@ -0,0 +1,26 @@
package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
import lombok.Data;
/**
* @author Wynne.Lu
* @date 2020/10/28 20:50
* @desc
*/
@Data
public class GoodRateModel {
private String workCenterCode;
private Double goodRate;
private Integer total;
private Integer goodTotal;
private String color;
private Double passPercentMax;
private Double passPercentMin;
}

@ -0,0 +1,30 @@
package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
import lombok.Data;
/**
* @author Wynne.Lu
* @date 2020/10/28 13:47
* @desc
*/
@Data
public class OeeModel {
private String workCenterCode;
private Integer takt;
private Integer standardTakt;
private String color;
private Double threshold = 0.03;
private Double realProductivity;
private Double oeePercent;
private Double realWorkTime;
private String shiftBeginTime;
}

@ -0,0 +1,20 @@
package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
import lombok.Data;
/**
* @author Wynne.Lu
* @date 2020/10/28 14:10
* @desc
*/
@Data
public class ProductivityModel {
private String time;
private Integer planProductivity;
private Integer realProductivity;
private boolean isCurrentInfo;
}

@ -0,0 +1,24 @@
package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
import cn.estsh.i3plus.pojo.mes.bean.MesStaff;
import lombok.Data;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/10/28 21:44
* @desc
*/
@Data
public class StaffMatrixModel {
private List<String> workCenterCodes;
private String currentWorkCenterCode;
private String workCenterPictureUrl;
private List<MesStaff> staffs;
}

@ -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.MesBoardLineCoordsMatrix;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-10-11
* @Modify:
**/
@Repository
public interface MesBoardLineCoordsMatrixRepository extends BaseRepository<MesBoardLineCoordsMatrix, Long> {
}

@ -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.MesBoardLineMatrix;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-10-11
* @Modify:
**/
@Repository
public interface MesBoardLineMatrixRepository extends BaseRepository<MesBoardLineMatrix, Long> {
}

@ -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.MesBoardLineStaffMatrix;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-10-11
* @Modify:
**/
@Repository
public interface MesBoardLineStaffMatrixRepository extends BaseRepository<MesBoardLineStaffMatrix, Long> {
}

@ -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.MesLineFaultRecord;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wynne.lu
* @CreateDate : 2019-07-30
* @Modify:
**/
@Repository
public interface MesLineFaultRecordRepository extends BaseRepository<MesLineFaultRecord, Long> {
}

@ -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.MesStaff;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesStaffRepository extends BaseRepository<MesStaff, Long> {
}
Loading…
Cancel
Save