解决冲突
wynne1005
5 years ago
commit
89ec0cbd71
@ -0,0 +1,52 @@
|
||||
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/8/24 17:47
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_SPC_CONTROL_COEFFICIENT")
|
||||
@Api("MES_SPC控制图系数")
|
||||
public class MesSpcControlCoefficient extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = -2790965693171941915L;
|
||||
|
||||
@Column(name = "SINGLE_GROUP_QTY")
|
||||
@ApiParam("子组容量")
|
||||
private Integer singleGroupQty;
|
||||
|
||||
@Column(name = "COEFFICIENT_TYPE")
|
||||
@ApiParam("系数类型")
|
||||
private String coefficientType;
|
||||
|
||||
@Column(name = "COEFFICIENT_CODE")
|
||||
@ApiParam("系数代码")
|
||||
private String coefficientCode;
|
||||
|
||||
@Column(name = "COEFFICIENT_DESC")
|
||||
@ApiParam("系数描述")
|
||||
private String coefficientDesc;
|
||||
|
||||
@Column(name = "COEFFICIENT_VALUE")
|
||||
@ApiParam("系数值")
|
||||
private Double coefficientValue;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
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/8/24 17:47
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_SPC_KEY_DATA")
|
||||
@Api("MES_SPC关键数据")
|
||||
public class MesSpcKeyData extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 2255345691671062029L;
|
||||
|
||||
@Column(name = "KD_CODE")
|
||||
@ApiParam("关键数据代码")
|
||||
private String kdCode;
|
||||
|
||||
@Column(name = "KD_NAME")
|
||||
@ApiParam("关键数据名称")
|
||||
private String kdName;
|
||||
|
||||
@Column(name = "NOMINAL_VALUE")
|
||||
@ApiParam("公称值")
|
||||
private Double nominalValue;
|
||||
|
||||
@Column(name = "SPEC_USL")
|
||||
@ApiParam("规格上限")
|
||||
private Double specUsl;
|
||||
|
||||
@Column(name = "SPEC_LSL")
|
||||
@ApiParam("规格下限")
|
||||
private Double specLsl;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("产线")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "OBJECT_TYPE")
|
||||
@ApiParam("取值对象类型")
|
||||
private Integer objectType;
|
||||
|
||||
@Column(name = "OBJECT_CODE")
|
||||
@ApiParam("取值对象")
|
||||
private String objectCode;
|
||||
|
||||
@Column(name = "FIELD_CODE")
|
||||
@ApiParam("取值字段")
|
||||
private String fieldCode;
|
||||
|
||||
@Column(name = "KD_CONDITION")
|
||||
@ApiParam("取值条件")
|
||||
private String kdCondition;
|
||||
}
|
||||
@ -0,0 +1,134 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/8/24 16:50
|
||||
* @desc
|
||||
*/
|
||||
public class BarRequestModel {
|
||||
|
||||
@ApiParam("产线")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("关键数据代码")
|
||||
private String keyData;
|
||||
|
||||
@ApiParam("零件号")
|
||||
private List<String> partNos;
|
||||
|
||||
@ApiParam("单组数量")
|
||||
private Integer count;
|
||||
|
||||
@ApiParam("组数")
|
||||
private Integer groupCount;
|
||||
|
||||
@ApiParam("总数")
|
||||
private Integer totalCount;
|
||||
|
||||
@ApiParam("开始时间")
|
||||
private String startTime;
|
||||
|
||||
@ApiParam("结束时间")
|
||||
private String endTime;
|
||||
|
||||
@ApiParam("均值图")
|
||||
private boolean xbar;
|
||||
|
||||
@ApiParam("极差图")
|
||||
private boolean rbar;
|
||||
|
||||
@ApiParam("正太分布图")
|
||||
private boolean normalDistribution;
|
||||
|
||||
public String getWorkCenterCode() {
|
||||
return workCenterCode;
|
||||
}
|
||||
|
||||
public void setWorkCenterCode(String workCenterCode) {
|
||||
this.workCenterCode = workCenterCode;
|
||||
}
|
||||
|
||||
public String getKeyData() {
|
||||
return keyData;
|
||||
}
|
||||
|
||||
public void setKeyData(String keyData) {
|
||||
this.keyData = keyData;
|
||||
}
|
||||
|
||||
public List<String> getPartNos() {
|
||||
return partNos;
|
||||
}
|
||||
|
||||
public void setPartNos(List<String> partNos) {
|
||||
this.partNos = partNos;
|
||||
}
|
||||
|
||||
public Integer getCount() {
|
||||
return count;
|
||||
}
|
||||
|
||||
public void setCount(Integer count) {
|
||||
this.count = count;
|
||||
}
|
||||
|
||||
public Integer getGroupCount() {
|
||||
return groupCount;
|
||||
}
|
||||
|
||||
public void setGroupCount(Integer groupCount) {
|
||||
this.groupCount = groupCount;
|
||||
}
|
||||
|
||||
public Integer getTotalCount() {
|
||||
return this.count * this.groupCount;
|
||||
}
|
||||
|
||||
public void setTotalCount(Integer totalCount) {
|
||||
this.totalCount = totalCount;
|
||||
}
|
||||
|
||||
public String getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
public void setStartTime(String startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public String getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(String endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public boolean isXbar() {
|
||||
return xbar;
|
||||
}
|
||||
|
||||
public void setXbar(boolean xbar) {
|
||||
this.xbar = xbar;
|
||||
}
|
||||
|
||||
public boolean isRbar() {
|
||||
return rbar;
|
||||
}
|
||||
|
||||
public void setRbar(boolean rbar) {
|
||||
this.rbar = rbar;
|
||||
}
|
||||
|
||||
public boolean isNormalDistribution() {
|
||||
return normalDistribution;
|
||||
}
|
||||
|
||||
public void setNormalDistribution(boolean normalDistribution) {
|
||||
this.normalDistribution = normalDistribution;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,98 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/8/26 14:46
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
public class NormalDistributionModel {
|
||||
|
||||
@ApiParam("尺寸上限")
|
||||
private Double usl;
|
||||
|
||||
@ApiParam("尺寸下限")
|
||||
private Double lsl;
|
||||
|
||||
@ApiParam("柱状图")
|
||||
private List<Integer> bar = new ArrayList<>();
|
||||
|
||||
@ApiParam("曲线图")
|
||||
private List<Double> line = new ArrayList<>();
|
||||
|
||||
@ApiParam("平均均值-绿线")
|
||||
private List<Double> xAxis = new ArrayList<>();
|
||||
|
||||
@ApiParam("数据个数")
|
||||
private Integer totalCount;
|
||||
|
||||
@ApiParam("数据总数")
|
||||
private Double totalDataSum;
|
||||
|
||||
@ApiParam("平均均值")
|
||||
private Double xbarbar;
|
||||
|
||||
@ApiParam("平均极差")
|
||||
private Double rbar;
|
||||
|
||||
@ApiParam("最大值")
|
||||
private Double maxValue;
|
||||
|
||||
@ApiParam("最小值")
|
||||
private Double minValue;
|
||||
|
||||
@ApiParam("低于下限数据个数")
|
||||
private Integer belowLowerLimitCount;
|
||||
|
||||
@ApiParam("高于上限数据个数")
|
||||
private Integer aboveUpperLimitCount;
|
||||
|
||||
@ApiParam("d2")
|
||||
private Double d2;
|
||||
|
||||
@ApiParam("n")
|
||||
private Integer n;
|
||||
|
||||
@ApiParam("高能力指数")
|
||||
private Double cpu;
|
||||
|
||||
@ApiParam("低能力指数")
|
||||
private Double cpl;
|
||||
|
||||
@ApiParam("过程能力指数")
|
||||
private Double cp;
|
||||
|
||||
@ApiParam("过程能力")
|
||||
private Double cpk;
|
||||
|
||||
@ApiParam("过程比率")
|
||||
private Double cr;
|
||||
|
||||
@ApiParam("标准偏差n")
|
||||
private Double stdOffset;
|
||||
|
||||
@ApiParam("标准偏差n-1")
|
||||
private Double stdOffsetMinusOne;
|
||||
|
||||
@ApiParam("方差n")
|
||||
private Double variance;
|
||||
|
||||
@ApiParam("方差n-1")
|
||||
private Double varianceMinusOne;
|
||||
|
||||
@ApiParam("性能指数")
|
||||
private Double pp;
|
||||
|
||||
@ApiParam("性能比率")
|
||||
private Double pr;
|
||||
|
||||
@ApiParam("性能指数")
|
||||
private Double ppk;
|
||||
|
||||
}
|
||||
@ -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.MesSpcControlCoefficient;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : if不良信息接口
|
||||
* @Reference :
|
||||
* @Author : siliter.yuan
|
||||
* @CreateDate : 2020-06-28 16:49
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesSpcControlCoefficientRepository extends BaseRepository<MesSpcControlCoefficient, Long> {
|
||||
|
||||
}
|
||||
@ -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.MesSpcKeyData;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : if不良信息接口
|
||||
* @Reference :
|
||||
* @Author : siliter.yuan
|
||||
* @CreateDate : 2020-06-28 16:49
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesSpcKeyDataRepository extends BaseRepository<MesSpcKeyData, Long> {
|
||||
|
||||
}
|
||||
@ -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.MesStateMachine;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Author : simon.song
|
||||
* @CreateDate : 2020-09-01
|
||||
**/
|
||||
public interface MesStateMachineRepository extends BaseRepository<MesStateMachine, Long> {
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
package cn.estsh.i3plus.pojo.wms.modelbean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 委外扣减库存
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2020-08-31 9:44
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("委外扣减库存模型")
|
||||
public class WmsShipModel extends BaseBean {
|
||||
|
||||
@ApiParam(value ="组织代码")
|
||||
public String organizeCode;
|
||||
|
||||
@ApiParam("物料编码")
|
||||
private String shipPartNo;
|
||||
|
||||
@ApiParam("物料名称")
|
||||
public String shipPartName;
|
||||
|
||||
@ApiParam("简称及版本")
|
||||
private String rcPartNo;
|
||||
|
||||
@ApiParam("项目名称")
|
||||
private String prodCfgTypeName;
|
||||
|
||||
@ApiParam("单位")
|
||||
public String unit;
|
||||
|
||||
@ApiParam("委外发运数量")
|
||||
public Double shipQty;
|
||||
|
||||
@ApiParam("发运存储区代码")
|
||||
public String shipZoneNo;
|
||||
|
||||
@ApiParam("ASN收货数量")
|
||||
private Double rcQty;
|
||||
|
||||
@ApiParam("ASN收货存储区代码")
|
||||
public String rcZoneNo;
|
||||
|
||||
@ApiParam("委外库存数量")
|
||||
private Double shipStockQty;
|
||||
|
||||
@ApiParam("委外发运时间")
|
||||
private String shipTime;
|
||||
|
||||
@ApiParam(value="发运时间，查询起始日期")
|
||||
public String shipTimeStart;
|
||||
|
||||
@ApiParam(value = "发运时间，查询结束日期")
|
||||
public String shipTimeEnd;
|
||||
}
|
||||
Loading…
Reference in New Issue