Merge branch 'dev' into test

yun-zuoyi
wynne1005 5 years ago
commit ba1ba8bc0f

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -51,10 +51,12 @@ public class AndonCellAlarmCause extends BaseBean implements Serializable {
@ApiParam(value = "事件描述")
private String acCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "安灯类型名称")
private String alarmCodeName;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "呼叫原因描述")
private String acName;

@ -45,4 +45,7 @@ public class CommonMsgModel implements Serializable {
@ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
private boolean errorInnerAction = false;
@ApiModelProperty("默认异常入库")
private boolean errorInsertFlag = true;
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -3482,6 +3482,7 @@ public class MesEnumUtil {
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPING(50, "发运"),
REDO(60, "重做"),
CLOSE(90, "关闭"),
;

@ -2376,6 +2376,7 @@ public class MesPcnEnumUtil {
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPPING(50, "发运"),
REDO(60, "重做"),
CLOSE(90, "关闭");
private int value;
@ -3398,6 +3399,7 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FSM_STATE_TYPE {
BEGIN(10, "begin", "开始状态点"),
BACK(20, "back", "回退状态点"),
END(40, "end", "结束状态点");
private int value;
@ -3600,7 +3602,8 @@ public class MesPcnEnumUtil {
START(10, "START", "开始状态"),
EXECUTING(20, "EXECUTING", "执行中状态"),
TERMINATE(30, "TERMINATE", "中断状态"),
FINISH(40, "FINISH", "完成状态");
FINISH(40, "FINISH", "完成状态"),
BACK(99, "BACK", "回退状态");
private int value;
private String code;
@ -4114,4 +4117,50 @@ public class MesPcnEnumUtil {
return tmp;
}
}
/**
* plc
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PLC_STATUS {
UN_CONNECT(0, "断开"),
CONNECT(1, "连接");
private int value;
private String description;
MES_PLC_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
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;
}
}
}

@ -1281,7 +1281,7 @@ public class PtlPcnEnumUtil {
}
/**
* mes-pcn
* ptl-pcn
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_PCN_TASK_SYNC_STATUS {
@ -1583,4 +1583,40 @@ public class PtlPcnEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYNC_FLAG {
UNSYNC(1, "未同步"),
SYNCED(2, "已同步");
private int value;
private String description;
SYNC_FLAG(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
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;
}
}
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -78,6 +78,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
@ApiParam("状态类型 10=初始化状态")
private Integer statusType;
@Column(name = "SEQ")
@ApiParam("状态点顺序")
private Integer seq;
@Transient
@ApiParam("状态点是否完成")
private boolean isComplete;

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
@Data
public class PlcEquStatusModel implements Serializable {
// 主站/从站
@ApiParam("站位")
private String stationPosition;
// 站位IP
@ApiParam("IP地址")
private String ipAddress;
// IP状态 -- 连接/断开
@ApiParam("IP状态")
private Integer ipStatus;
// 电检设备名称
@ApiParam("电检设备名称")
private String electricalEqu;
// 电检设备状态哦 -- 连接/断开
@ApiParam("电检设备状态")
private Integer electricalEquStatus;
// 产线状态
@ApiParam("产线状态")
private Integer workCenterStatus;
@ApiParam("停机类型")
private Integer stopType;
@ApiParam("产品条码")
private String productSn;
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partName;
@ApiParam("工作中心代码")
private String workCenterCode;
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("停机开始时间")
private String stopStartTime;
@ApiParam("停机结束时间")
private String stopEndTime;
@ApiParam("停机原因")
private String stopReason;
}

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

@ -2937,4 +2937,49 @@ public class MesHqlPack {
}
return packBean;
}
/**
*
* @param partCheck
* @param organizeCode
* @return
*/
public static DdlPackBean getMesPartCheck(MesPartCheck partCheck, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(partCheck, organizeCode);
if (!StringUtils.isEmpty(partCheck.getPartNo())) {
DdlPreparedPack.getStringEqualPack(partCheck.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(partCheck.getObjectCode())) {
DdlPreparedPack.getStringEqualPack(partCheck.getObjectCode(), "objectCode", packBean);
}
return packBean;
}
/**
*
*
* @param qcOrderDetail
* @param organizeCode
* @return
*/
public static DdlPackBean getMesQcOrderDetailData(MesQcOrderDetail qcOrderDetail, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode);
if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
DdlPreparedPack.getStringRightLikerPack(qcOrderDetail.getOrderNo(), "orderNo", packBean);
}
if (qcOrderDetail.getCheckType() != null) {
DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean);
}
if (!StringUtils.isEmpty(qcOrderDetail.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(qcOrderDetail.getSerialNumber(), "serialNumber", packBean);
}
if (!StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
qcOrderDetail.getCreateDateTimeStart(),
qcOrderDetail.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
}

@ -119,13 +119,13 @@ public class MesPcnHqlPack {
* @param rawPartSn
* @return
*/
public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) {
public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) {
DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean);
DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean);
DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean);
DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean);
return packBean;
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -0,0 +1,54 @@
package cn.estsh.i3plus.pojo.ptl.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 wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "IF_PICK_DATA")
@EqualsAndHashCode(callSuper = true)
@Api("IF_拣货数据")
public class IfPickData extends BaseBean implements Serializable {
private static final long serialVersionUID = -1057633269490937118L;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
private String areaNo;
@Column(name = "SECTION_NO")
@ApiParam("区段编号")
private String sectionNo;
@Column(name = "PART_NO")
@ApiParam("物料编号")
private String partNo;
@Column(name = "QTY")
@ApiParam("拣货数量")
private Integer qty;
@Column(name = "SYNC_FLAG")
@ApiParam("同步标识")
private Integer syncFlag;
}

@ -51,4 +51,7 @@ public class CommonMsgModel implements Serializable {
@ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
private boolean errorInnerAction = false;
@ApiModelProperty("默认异常入库")
private boolean errorInsertFlag = true;
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.IfPickData;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
public interface IfPickDataRepository extends BaseRepository<IfPickData, Long> {
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>

Loading…
Cancel
Save