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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
曾贞一 5 years ago
parent 4dae2eea7d 52a5c1e2f8
commit c926992611
13 changed files with 345 additions and 43 deletions
Show Stats Download Patch File Download Diff File

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

@ -3053,7 +3053,8 @@ public class MesEnumUtil {
ATTEMPT_ORDER(30, "试制工单"),
BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单"),
STOCK_ORDER(60, "库存工单");
STOCK_ORDER(60, "库存工单"),
REPAIR(70,"返修插单");
private int value;
private String description;

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

@ -5357,18 +5357,18 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WAVE_MERGE_RULE {
IS_SAME_CUSTOMER("同客户", "isSameCustomer", 2, 10),
IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", 1, 10),
IS_SAME_PRIORITY("同优先级", "isSamePriority", 1, 10),
IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", 2, 10),
IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", 2, 10),
IS_SAME_PART("同物料", "isSamePart", 2, 10),
IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", 2, 10),
IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", 2, 10),
IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", 1, 10),
IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", 1, 10),
IS_CROSS_AREA("允许跨区", "isCrossArea", 2, 10),
IS_COLLECTION("物料整箱归集", "isCollection", 2, 10);
IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10),
IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10),
IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10),
IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10),
IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10),
IS_SAME_PART("同物料", "isSamePart", "2", 10),
IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10),
IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10),
IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10),
IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10),
IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10),
IS_COLLECTION("物料整箱归集", "isCollection", "2", 10);
private String chName;
@ -5376,12 +5376,12 @@ public class WmsEnumUtil {
private int waveMergeType;
private int value;
private String fieldValue;
WAVE_MERGE_RULE(String chName, String enName, int value, int waveMergeType) {
WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) {
this.chName = chName;
this.enName = enName;
this.value = value;
this.fieldValue = fieldValue;
this.waveMergeType = waveMergeType;
}
@ -5393,8 +5393,8 @@ public class WmsEnumUtil {
return enName;
}
public int getValue() {
return value;
public String getFieldValue() {
return fieldValue;
}
public int getWaveMergeType() {
@ -5408,23 +5408,29 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WAVE_MERGE_RANGE {
CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
"custNo, custName", "custNo, custName", "custNo", 20),
"custNo, custName", "custNo, custName", "custNo",
20, ""),
WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
"code, name", "code, name", "code", 20),
"code, name", "code, name", "code",
20, ""),
PRIORITY("优先级", "priority", "PRIORITY_NEW", "",
"", "", 20),
"", "", 20, ""),
SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
"zoneNo, zoneName", "zoneNo", "zoneNo", 20),
"zoneNo, zoneName", "zoneNo", "zoneNo",
20, ""),
DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
"zoneNo, zoneName", "zoneNo", "zoneNo", 20),
"zoneNo, zoneName", "zoneNo", "zoneNo",
20, ""),
PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
"partNo, partName", "partNo", "partNo", 20),
PART_GROUP_NO("物料组代码", "partGroupNo", "", "",
"", "", 20),
"partNo, partName", "partNo", "partNo",
20, ""),
PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup",
"partGroupNo, partGroupName", "partGroupNo",
"partGroupNo", 20, ""),
BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "",
"", "", 20),
"", "", 20, ""),
ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "",
"", "", 20);
"", "", 20, "");
// 中文名称
String chName;
@ -5441,8 +5447,10 @@ public class WmsEnumUtil {
// 合并操作类型
private int waveMergeType;
private String fieldValue;
WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName,
String searchColumnName, String explicitColumnName, int waveMergeType) {
String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) {
this.chName = chName;
this.enName = enName;
this.entityName = entityName;
@ -5450,6 +5458,7 @@ public class WmsEnumUtil {
this.searchColumnName = searchColumnName;
this.explicitColumnName = explicitColumnName;
this.waveMergeType = waveMergeType;
this.fieldValue = fieldValue;
}
public String getChName() {
@ -5479,6 +5488,10 @@ public class WmsEnumUtil {
public int getWaveMergeType() {
return waveMergeType;
}
public String getFieldValue() {
return fieldValue;
}
}
/**
@ -5489,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;
@ -5716,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;
}
}

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

@ -20,6 +20,9 @@ public class ButtonComponentResultModel {
@ApiParam("成功信号")
private boolean isSuccess;
@ApiParam("是否跳过工序")
private boolean isJumpProcess;
@ApiParam("提示信息")
private String msg;

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

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
Unescape Escape View File

@ -115,6 +115,10 @@ public class WmsASNMaster extends BaseBean {
@ApiParam("备注")
public String remark;
@Column(name = "DOCK",columnDefinition = "varchar(50) default '1'")
@ApiParam("道口")
public String dock;
@Transient
@ApiParam("供应商电话")
private String vendorCall;

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