yun-zuoyi
wynne1005 5 years ago
commit 9d81ec30d1

@ -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;

@ -7972,4 +7972,44 @@ public class MesEnumUtil {
}
}
/**
* -
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_QUEUE_STATUS {
CALL(10, "呼叫"),
RESPONSE(20, "响应"),
SOLVE(30, "解决");
private int value;
private String description;
ANDON_QUEUE_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getValueStr() {
return value + "";
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -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;

@ -580,7 +580,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public int listCount() {
try{
Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model",Long.class)
Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model", Long.class)
.getSingleResult();
return count == null ? 0 : count.intValue();
}catch(NoResultException e){

@ -237,7 +237,7 @@ public class DdlPreparedPack {
*/
public static void getStringRightLikerPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val + "%");
packBean.addColumnQuery("rl_"+columnName, " and model." + columnName + " like :m_rl_" + columnName, val + "%");
}
}
@ -250,7 +250,7 @@ public class DdlPreparedPack {
*/
public static void getStringLeftLikerPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val);
packBean.addColumnQuery("ll_"+columnName, " and model." + columnName + " like :m_ll_" + columnName, "%" + val);
}
}

@ -37,4 +37,8 @@ public class MesBoardPicture extends BaseBean implements Serializable {
@Column(name = "PICTURE_URL")
@ApiParam("图片路径")
private String pictureUrl;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
}

@ -33,12 +33,12 @@ public class MesBoardSwitchCfg extends BaseBean implements Serializable {
@ApiParam("看板代码")
private String boardCode;
@Column(name = "SWITCH_INTERRVAL")
@Column(name = "SWITCH_INTERVAL")
@ApiParam("屏切换频次")
private Integer switchInterrval;
private Integer switchInterval;
@Column(name = "LINE_SWITCH_INTERRVAL")
@Column(name = "LINE_SWITCH_INTERVAL")
@ApiParam("产线切换频次")
private Integer lineSwitchInterrval;
private Integer lineSwitchInterval;
}

@ -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"})
})

@ -98,4 +98,8 @@ public class MesWorkCell extends BaseBean implements Serializable {
@ApiParam("工位类型名称")
private String workCellTypeName;
@Transient
@ApiParam("安灯呼叫状态")
private Integer andonQueueStatus;
}

@ -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;
}

@ -20,6 +20,21 @@ public class MgnBoardListModel {
@ApiParam("当班实际产量")
private Double shiftActualYield;
@ApiParam("当前时间分钟")
private String currentMinTime;
/**
*
*/
@ApiParam("每分钟计划产量")
private Double minPlanYield;
/**
*
*/
@ApiParam("每分钟实际产量")
private Double minActualYield;
@ApiParam("计划完成率")
private String planCompleteRate;

@ -111,4 +111,12 @@ public class QueueJitActualModel {
this.createDatetime = createDatetime;
}
public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String produceCtgyCode, String custPlantCode, String createDatetime) {
this.id = id;
this.vinCode = vinCode;
this.jisActualNo = jisActualNo;
this.produceCtgyCode = produceCtgyCode;
this.custPlantCode = custPlantCode;
this.createDatetime = createDatetime;
}
}

@ -0,0 +1,41 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/10/28 11:27 AM
* @Modify:
*/
@Data
public class BjBoardModel implements Serializable {
@ApiParam("jsa数量")
private Integer jsaQty;
@ApiParam("完成数量")
private Integer completeQty;
@ApiParam("总数量")
private Integer totalQty;
@ApiParam("预警数量")
private Integer warnQty;
@ApiParam("预警率")
private Integer warnRate;
@ApiParam("目标合格率")
private Integer targetRate = 0;
@ApiParam("一次合格率")
private Integer onceQualityRate = 0;
@ApiParam("x坐标内容")
private String xAxis;
@ApiParam("x坐标内容")
private List<String> xAxisList;
@ApiParam("显示数据")
private List<BjBoardSeriesModel> seriesModels;
}

@ -0,0 +1,18 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/10/28 2:56 PM
* @Modify:
*/
@Data
public class BjBoardSeriesModel {
@ApiParam("名称")
private String name;
@ApiParam("显示数量")
private Integer qty;
}

@ -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);

@ -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,34 @@ 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;
}
public WmsStockQuan(String partNo, String partNameRdd, Double qty) {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.qty = qty;
}
}

@ -72,6 +72,11 @@ public class WmsWorkCenter extends BaseBean {
searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
private String descLocationCode;
@Column(name = "PRE_WO_MINUTE", columnDefinition = "int default 600")
@ApiParam(value = "计算未完成工单的提前时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer preWoMinute;
@Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180")
@ApiParam(value = "提前拉动时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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 : ERP
* @Reference :
* @Author : rock.yu
* @CreateDate : 2020-10-27 14:06
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_ERP_QUAN_AREAS")
public class WmsErpQuanAreas extends BaseBean implements Comparable<WmsErpQuanAreas> {
private static final long serialVersionUID = 5560607687871639209L;
@Column(name="AREA_NO")
@ApiParam("库存地点")
public String areaNo;
@Override
public int compareTo(WmsErpQuanAreas o) {
return this.getAreaNo().compareTo(o.getAreaNo());
}
}

@ -17,6 +17,12 @@ import lombok.Data;
public class WmsVendorDelayMasterModel extends BaseBean {
private static final long serialVersionUID = 1589775350017343999L;
@ApiParam(value = "订单号")
private String orderNo;
@ApiParam(value = "原因")
public String reason;
@ApiParam(value = "供应商代码")
private String vendorNo;
@ -26,12 +32,28 @@ public class WmsVendorDelayMasterModel extends BaseBean {
@ApiParam(value = "延迟次数")
private Long delayCount;
@ApiParam(value = "延迟次数")
private Long sumDelayCount;
@ApiParam(value = "查询开始时间")
private String startDateTime;
@ApiParam(value = "查询结束时间")
private String endDateTime;
@ApiParam("计划交货日期")
private String planDate;
@ApiParam("计划交货时间")
private String planTime;
@ApiParam("实际交货时间")
private String actualPlanTime;
@ApiParam("计划交货时间")
private String planPlanDateTime;
public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode, String createDateTime) {
this.vendorNo = vendorNo;
this.vendorName = vendorName;
@ -40,6 +62,22 @@ public class WmsVendorDelayMasterModel extends BaseBean {
this.createDatetime = createDateTime;
}
public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime, String actualPlanTime, String vendorNo, String vendorName, String organizeCode) {
this.orderNo = orderNo;
this.reason = reason;
this.planDate = planDate;
this.planTime = planTime;
this.actualPlanTime = actualPlanTime;
this.vendorNo = vendorNo;
this.vendorName = vendorName;
this.organizeCode = organizeCode;
}
public WmsVendorDelayMasterModel(String vendorNo, Long delayCount) {
this.vendorNo = vendorNo;
this.delayCount = delayCount;
}
public WmsVendorDelayMasterModel() {
}

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpCheckPoint;
import org.springframework.stereotype.Repository;
@Repository
public interface WmsErpCheckPointRepository extends BaseRepository<WmsErpCheckPoint, Long> {
}

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpQuanAreas;
import org.springframework.stereotype.Repository;
@Repository
public interface WmsErpQuanAreasRepository extends BaseRepository<WmsErpQuanAreas, Long> {
}

@ -1749,11 +1749,14 @@ public class WmsHqlPack {
*/
public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getOrderByPack(
/*DdlPreparedPack.getOrderByPack(
new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE},
new String[]{"sn", "createDatetime"}, result);
new String[]{"sn", "createDatetime"}, result);*/
// result.setWhereAppend(result.getWhereAppend() + " and sn <> '"+wmsStockSn.getSn()+"'");
return result;
}

Loading…
Cancel
Save