yun-zuoyi
rock.yu 5 years ago
commit 330cede03e

@ -294,6 +294,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
@ApiParam(value ="故障时长-分钟")
private Integer brokenTime;
@Transient
@ApiParam(value ="故障字符串")
private String faultStr;
// 是否转呼
public Integer getIsShiftCall() {
return this.isShiftCall == null ? 0 : this.isShiftCall;

@ -36,7 +36,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯记录")
@Api("去去去去去去去去去安灯记录")
public class AndonManageRecord extends BaseManageQueue implements Serializable {
private static final long serialVersionUID = 4667499369694353351L;

@ -103,4 +103,8 @@ public class AndonQueueAttach extends BaseBean implements Serializable {
@ApiParam(value ="生产累计件数")
private Integer totalProdNum;
@Column(name="FAULT_STR")
@ApiParam(value ="故障字符串")
private String faultStr;
}

@ -904,6 +904,7 @@ public class AndonEnumUtil {
/**
*
* =10 =20 =30, 线=40, =50, =60, =70 =80
* 20201027 90 =, 10 =
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_BUSI_FLAG{
@ -914,7 +915,9 @@ public class AndonEnumUtil {
DETAIL_TYPE("50", "安灯子类型"),
AC_CODE("60", "原因代码"),
PROD_INFO("70", "产品信息"),
LINE_INFO("80", "产量信息");
LINE_INFO("80", "产量信息"),
PRIORITY_LEVEL("90", "优先级"),
FAULT_STR("100", "故障字符串");
private String value;
private String description;
@ -1063,7 +1066,8 @@ public class AndonEnumUtil {
public enum ALARM_PRIORITY{
FIRST(10,"一级"),
SECOND(20,"二级"),
THIRD(30,"三级");
THIRD(30,"三级"),
FOUR(40,"四级");
private int value;
private String description;

@ -1454,7 +1454,8 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WC_CHECK_TYPE {
MATERIAL(10, "MATERIAL", "物料"),
ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号");
ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"),
WORK_ORDER(30, "WORK_ORDER", "工单信息");
private int value;
private String code;

@ -4035,7 +4035,7 @@ public class WmsEnumUtil {
public enum INVENTORY_DIFFERENCE_TYPE {
INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"),
INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"),
INVENTORY_WIN(30, "INVENTORY_WIN", "盘"),
INVENTORY_WIN(30, "INVENTORY_WIN", "盘"),
INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"),
INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘");

@ -0,0 +1,78 @@
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:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\13 11:47
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_LINE")
@Api("看板产线配置")
public class MesBoardLine extends BaseBean implements Serializable {
private static final long serialVersionUID = 5212593630787939081L;
@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 = "PLAN_OEE")
@ApiParam("目标OEE")
private Double planOee;
@Column(name = "PLAN_TAKT")
@ApiParam("计划节拍")
private Integer planTakt;
@Column(name = "PASS_PERCENT_MAX")
@ApiParam("良品率上限")
private Double passPercentMax;
@Column(name = "PASS_PERCENT_MIN")
@ApiParam("良品率下限")
private Double passPercentMin;
@Column(name = "CAR_RUN_TIME")
@ApiParam("小车运行时间(分)")
private Integer carRunTime;
@Column(name = "TEST_CAR_SUM")
@ApiParam("调试车数")
private Integer testCarSum;
@Column(name = "PLAN_FIRST_PASS_YIELD")
@ApiParam("一次良品率目标值")
private Double planFirstPassYield;
@Column(name = "PLAN_PASS_YIELD")
@ApiParam("最终良品率目标值")
private Double planPassYield;
}

@ -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;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\16 15:03
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLAN_TAKT")
@Api("产线节拍表")
public class MesPlanTakt extends BaseBean implements Serializable {
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "PLAN_TAKT")
@ApiParam("节拍")
private Integer planTakt;
}

@ -25,7 +25,9 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER", indexes = {
@Index(columnList = "CUST_FLAG_NO")
@Index(columnList = "CUST_FLAG_NO"),
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "ORDER_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
})

@ -9,10 +9,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.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -27,7 +24,11 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER_BOM")
@Table(name = "MES_QUEUE_ORDER_BOM", indexes = {
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "ORDER_NO"),
@Index(columnList = "PART_NO")
})
@Api("MES_生产队列散件清单")
public class MesQueueOrderBom extends BaseBean implements Serializable {

@ -25,7 +25,10 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
@Index(columnList = "ORDER_NO")
@Index(columnList = "ORDER_NO"),
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "QUEUE_GROUP_NO"),
@Index(columnList = "PRODUCE_CATEGORY_CODE")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO", "PRODUCE_CATEGORY_CODE"})
})

@ -0,0 +1,44 @@
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:
* @CreateDate: 2020/10/26
* @Author: simon.song
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_REAL_TIME_TAKT")
@Api("MES_实时节拍")
public class MesRealTimeTakt extends BaseBean implements Serializable {
private static final long serialVersionUID = 2910474711746286558L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "REAL_TIME_TAKT")
@ApiParam("实时节拍")
private String realTimeTakt;
}

@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.annotation.Transient;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -57,14 +58,20 @@ public class MesShift extends BaseBean implements Serializable {
@ApiParam("作业时长")
private Double workTimes;
@Column(name="SHIFT_SEQ")
@Column(name = "SHIFT_SEQ")
@ApiParam("班次顺序")
private Integer shiftSeq;
@Column(name="AREA_CODE")
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Transient
private String queryBeginTime;
@Transient
private String queryEndTime;
public int getShiftSeqVal() {
return this.shiftSeq == null ? 0 : this.shiftSeq;
}

@ -11,10 +11,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.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
@ -30,7 +27,13 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_POINT")
@Table(name = "MES_WORK_CELL_POINT", indexes = {
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "WORK_CENTER_CODE"),
@Index(columnList = "WORK_CELL_CODE"),
@Index(columnList = "QUEUE_SEQ"),
@Index(columnList = "QUEUE_DETAIL_SEQ")
})
@Api("工站队列")
public class MesWorkCellPoint extends BaseBean implements Serializable {

@ -9,10 +9,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.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -27,7 +24,13 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_POINT_GROUP")
@Table(name = "MES_WORK_CELL_POINT_GROUP", indexes = {
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "WORK_CENTER_CODE"),
@Index(columnList = "WORK_CELL_CODE"),
@Index(columnList = "QUEUE_GROUP_NO"),
@Index(columnList = "ORDER_NO")
})
@Api("工站分组队列")
public class MesWorkCellPointGroup extends BaseBean implements Serializable {

@ -0,0 +1,21 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :-
* @Reference :
* @author: dominic
* @date: 2020/10/23 13:46
* @Modify:
*/
@Data
public class MesBoardHourProductCountModel {
@ApiParam("时间段")
private String hour;
@ApiParam("计数")
private Integer count;
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardLine;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 8:53
* @Modify:
*/
@Repository
public interface MesBoardLineRepository extends BaseRepository<MesBoardLine, Long> {
}

@ -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.MesPlanTakt;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\18 10:34
* @Modify:
**/
public interface MesPlanTaktRepository extends BaseRepository<MesPlanTakt, Long> {
}

@ -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.MesRealTimeTakt;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @CreateDate: 2020/10/26
* @Author: simon.song
*/
@Repository
public interface MesRealTimeTaktRepository extends BaseRepository<MesRealTimeTakt, Long> {
}

@ -52,11 +52,7 @@ public class SwebHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result);
if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) {
DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
} else {
DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
}
DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);

@ -11,7 +11,11 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
@ -148,7 +152,7 @@ public class WmsCSOrderDetails extends BaseBean {
public String[] zoneNos;
/**
* 102030
* 102030
*/
@Transient
@ApiParam("差异类型")
@ -156,7 +160,7 @@ public class WmsCSOrderDetails extends BaseBean {
public Integer differenceType;
/**
* 102030
* 102030
*/
@Transient
@ApiParam("差异集合")

@ -278,6 +278,18 @@ public class WmsPOMasterDetails extends BaseBean {
this.qty = qty;
}
public WmsPOMasterDetails(String orderNo, String partNo, String partNameRdd, String planDate, String planTime,
Double snp, Long totalBoxes, Double qty) {
this.orderNo = orderNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.planDate = planDate;//批次号yyyyMMdd
this.planTime = planTime;//批次号yyyyMMdd
this.snp = snp;
this.totalBoxes = totalBoxes.intValue();
this.qty = qty;
}
public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty,
Double rcQty, Integer itemStatus) {
this.orderNo = orderNo;

@ -332,4 +332,28 @@ public class WmsStockQuan extends BaseBean {
this.scrapQty = scrapQty;
this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty;
}
public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName,
Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
Double consignQty, Double lockQty, Double totalQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty, String areaNo) {
this.organizeCode = organizeCode;
this.whNo = whNo;
this.zoneNo = zoneNo;
this.unit = unit;
this.partNo = partNo;
this.partNameRdd = partName;
this.qty = qty;
this.failQty = failQty;
this.holdQty = holdQty;
this.qcQty = qcQty;
this.rinQty = rinQty;
this.freezeQty = freezeQty;
this.consignQty = consignQty;
this.lockQty = lockQty;
this.totalQty = totalQty;
this.prodCfgTypeCode = prodCfgTypeCode;
this.prodCfgTypeName = prodCfgTypeName;
this.scrapQty = scrapQty;
this.areaNo = areaNo;
}
}

@ -56,9 +56,9 @@ public class WmsQCStatusModel {
private Double proportion;
@ApiParam("标准质检时间")
private Integer stdCheckTime;
private Double stdCheckTime;
public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Integer stdCheckTime) {
public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Double stdCheckTime) {
this.asnOrderNo = asnOrderNo;
this.qcOrderNo = qcOrderNo;
this.partNo = partNo;

Loading…
Cancel
Save