I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into dev

Browse Source
yun-zuoyi
钮海涛 5 years ago
parent 15035d2851 851bd1feec
commit 52a5c1e2f8
10 changed files with 295 additions and 14 deletions
Show Stats Download Patch File Download Diff File

45
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -5502,10 +5502,6 @@ public class WmsEnumUtil {
WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"),
WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围");
private int value;
private String code;
private String description;
WAVE_MERGE_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
@ -5729,6 +5725,47 @@ public class WmsEnumUtil {
}
public static String valueOf(int val) {
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;
}
}
/**
* 推送类型单位
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QAD_DOC_TYPE {
TYPE_S(10, "s","s"), TYPE_D(20, "d","d");
private int value;
private String code;
private String description;
public String getCode() {
return code;
}
QAD_DOC_TYPE(int value,String code, String description) {
this.value = value;
this.code = code;
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) {

12
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
Unescape Escape View File

@ -67,4 +67,16 @@ public class QueueOrderModel implements Serializable {
this.snStatus = snStatus;
this.workType = workType;
}
public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType) {
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.workType = workType;
}
}

7
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import java.io.Serializable;
/**
@ -92,6 +93,9 @@ public class MesPlcModel implements Serializable {
@ApiParam("对象代码")
private String objectCode;
@ApiParam("OPCUA路径")
private String opcUrl;
public MesPlcModel() {
}
@ -99,7 +103,7 @@ public class MesPlcModel implements Serializable {
public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode) {
String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
@ -126,5 +130,6 @@ public class MesPlcModel implements Serializable {
this.isAnalysis = isAnalysis;
this.device = device;
this.objectCode = objectCode;
this.opcUrl = opcUrl;
}
}

66
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java
Unescape Escape View File

@ -0,0 +1,66 @@
package cn.estsh.i3plus.pojo.mes.model;
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_JIT发运队列
* @Reference :
* @Author : qianhausheng
* @CreateDate : 2020-03-06 10:16 上午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_SHIPPING")
@Api("MES_JIT发运队列")
public class MesQueueShipping extends BaseBean implements Serializable {
private static final long serialVersionUID = 655875369308414110L;
@Column(name = "JIT_NO")
@ApiParam("队列编号")
private String jitNo;
@Column(name = "PROD_CFG_CODE")
@ApiParam("配置代码")
private String prodCfgCode;
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "CUST_FLAG_NO")
@ApiParam("客户标识号")
private String custFlagNo;
@Column(name = "SEQ")
@ApiParam("排序号")
private Double seq;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户产线代码")
private String custPlantCode;
}

73
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java
Unescape Escape View File

@ -0,0 +1,73 @@
package cn.estsh.i3plus.pojo.mes.model;
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_JIT发运队列明细
* @Reference :
* @Author : qianhausheng
* @CreateDate : 2020-03-06 10:16 上午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_SHIPPING_DETAIL")
@Api("MES_JIT发运队列明细")
public class MesQueueShippingDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 1442091799346314190L;
@Column(name = "JIT_NO")
@ApiParam("队列编号")
private String jitNo;
@Column(name = "PROD_CFG_CODE")
@ApiParam("配置代码")
private String prodCfgCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "status")
@ApiParam("状态")
private Integer status;
@Column(name="SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@Column(name = "GROUP_NO")
@ApiParam("组内编号")
private Integer groupNo;
@Column(name = "GROUP_SEQ")
@ApiParam("分组序号")
private String groupSeq;
@Column(name = "qty")
@ApiParam("数量")
private Double qty;
}

61
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
Unescape Escape View File

@ -120,7 +120,39 @@ public class QueueOrderModel implements Serializable {
this.snStatus = snStatus;
this.workType = workType;
}
public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) {
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.serialNumber = serialNumber;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.snStatus = snStatus;
this.workType = workType;
this.finsihQty=finsihQty;
this.qty=qty;
this.orderNo=orderNo;
}
public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.serialNumber = serialNumber;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.snStatus = snStatus;
this.workType = workType;
this.orderNo=orderNo;
}
public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) {
this.id = id;
this.queDetailSeq = queDetailSeq;
@ -129,16 +161,33 @@ public class QueueOrderModel implements Serializable {
this.groupNo = groupNo;
this.prodCfgCode = prodCfgCode;
}
public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {
this.queueGroupNo = queueGroupNo;
this.groupNo = groupNo;
public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType,Double finsihQty,Double qty) {
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.workType = workType;
this.finsihQty=finsihQty;
this.qty=qty;
this.orderNo=orderNo;
}
public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType) {
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
this.custFlagNo = custFlagNo;
this.prodCfgNameRdd = prodCfgNameRdd;
this.categoryNameRdd = categoryNameRdd;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.organizeCode = organizeCode;
this.workType = workType;
this.orderNo=orderNo;
}
}

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
Unescape Escape View File

@ -8,6 +8,7 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -101,7 +102,7 @@ public class StationRequestBean implements Serializable {
private String queueGroupNo;
@ApiParam("数据map")
private Map<String, Object> dataMap;
private Map<String, Object> dataMap=new HashMap<>();
@ApiParam("流程状态集合")
private List<MesRouteStatus> routeStatusList;

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java
Unescape Escape View File

@ -20,13 +20,16 @@ public class StepDispatchModel {
private String requestBeanKey;
private String moduleDataMapKey;
private String scanInfo;
public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String scanInfo) {
public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) {
this.stepListKey = stepListKey;
this.firstScanKey = firstScanKey;
this.cellParamKey = cellParamKey;
this.requestBeanKey = requestBeanKey;
this.moduleDataMapKey = moduleDataMapKey;
this.scanInfo = scanInfo;
}
}

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -1079,6 +1079,9 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode);
if (!StringUtils.isEmpty(workCellParamCfg.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(workCellParamCfg.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean);
}

34
pom.xml
Unescape Escape View File

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-${profileActive}-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>
@ -254,4 +254,36 @@
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
<profiles>
<profile>
<id>dev</id>
<properties>
<profileActive>DEV</profileActive>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>test</id>
<properties>
<profileActive>TEST</profileActive>
</properties>
</profile>
<profile>
<id>docker</id>
<properties>
<profileActive>DOCKER</profileActive>
</properties>
</profile>
<profile>
<id>prod</id>
<properties>
<profileActive>PROD</profileActive>
</properties>
</profile>
</profiles>
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
</build>
</project>
Write Preview
Loading…
Cancel
Save