diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 921cbf3..bdcae3c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -286,6 +286,67 @@ public class PtlPcnEnumUtil { } /** + * 反馈信号子命令(灭灯状态) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SIGNAL_CHILD_CMD { + CHILD_CMD_06H("06", 6, "正常"), + CHILD_CMD_07H("07", 7, "缺货"), + CHILD_CMD_09H("09", 9, "标签自检"), + CHILD_CMD_0AH("0A", 10, "亮灯错误"), + CHILD_CMD_0BH("0B", 11, "查询设备故障，返回设备故障"), + CHILD_CMD_0CH("0C", 12, "设备无法执行命令,用错命令"), + CHILD_CMD_0DH("0D", 13, "卡键,按键卡住"), + CHILD_CMD_0FH("0F", 15, "返回库存模式下的缺货量"), + CHILD_CMD_64H("64", 100, "熄灭情况下返回"), + CHILD_CMD_FAH("FA", 250, "设备的 F/W 模型信息"), + CHILD_CMD_FCH("FC", 252, "标签产品信息"); + + private String code; + private Integer value; + private String description; + + SIGNAL_CHILD_CMD(String code, Integer value, String description) { + this.code = code; + this.value = value; + this.description = description; + } + + public static SIGNAL_CHILD_CMD getByValue(String code) { + for (SIGNAL_CHILD_CMD signalChildCmd : values()) { + if (signalChildCmd.getCode().equals(code)) { + return signalChildCmd; + } + } + return null; + } + + public static Integer codeOfValue(String code) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + + public String getCode() { + return code; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + } + + /** * 标签显示器亮灯颜色枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -309,7 +370,7 @@ public class PtlPcnEnumUtil { public static TAG_LIGHT_COLOR_CMD getByValue(String code) { for (TAG_LIGHT_COLOR_CMD tagLightColorCmd : values()) { - if (tagLightColorCmd.getCode() == code) { + if (tagLightColorCmd.getCode().equals(code)) { return tagLightColorCmd; } } @@ -396,7 +457,7 @@ public class PtlPcnEnumUtil { public static FINISH_TAG_LIGHT_MUSIC_CMD getByValue(String code) { for (FINISH_TAG_LIGHT_MUSIC_CMD finishTagLightMusicCmd : values()) { - if (finishTagLightMusicCmd.getCode() == code) { + if (finishTagLightMusicCmd.getCode().equals(code)) { return finishTagLightMusicCmd; } } @@ -459,7 +520,7 @@ public class PtlPcnEnumUtil { public static FINISH_TAG_LIGHT_VOLUME_CMD getByValue(String code) { for (FINISH_TAG_LIGHT_VOLUME_CMD finishTagLightVolumeCmd : values()) { - if (finishTagLightVolumeCmd.getCode() == code) { + if (finishTagLightVolumeCmd.getCode().equals(code)) { return finishTagLightVolumeCmd; } } @@ -675,7 +736,8 @@ public class PtlPcnEnumUtil { DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"), - INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"); + INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"), + GET_CONTROL_DATA_CONTROL_CMD(50, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据"); // UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"), // LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), // LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细"); @@ -1327,4 +1389,352 @@ public class PtlPcnEnumUtil { return tmp; } } + + /** + * ptl-pcn定时任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_PCN_TASK_STATUS { + + OPEN(1, "开启"), + CLOSE(2, "关闭"); + + private int value; + private String description; + + PTL_PCN_TASK_STATUS(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; + } + } + + /** + * mes-pcn定时任务同步结果状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_PCN_TASK_SYNC_STATUS { + + SUCCESS(1, "ptl主服务定时任务工作清单同步成功"), + ERROR(2, "ptl主服务定时任务工作清单同步失败"); + + private int value; + private String description; + + PTL_PCN_TASK_SYNC_STATUS(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; + } + } + + /** + * 单据主表类型(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MASTER_ORDER_TYPE { + CREATE(10, "NORMAL", "正常"); + + private int value; + private String code; + private String description; + + MASTER_ORDER_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + /** + * 区域任务状态(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MASTER_ORDER_STATUS { + CREATE(10, "CREATE", "创建"), + RECEIPT(20, "IN_PROGRESS", "处理中"), + RECEIPT_FINISH(30, "COMPLETED", "已完成"), + CANCELLED(40, "CANCELLED", "已取消"); + + private int value; + private String code; + private String description; + + MASTER_ORDER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + /** + * 区域任务类型(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AREA_SECTION_TASK_TYPE { + CREATE(10, "CREATE", "JIT任务"), + RECEIPT(20, "IN_PROGRESS", "单据任务"), + RECEIPT_FINISH(30, "COMPLETED", "单点任务"); + + private int value; + private String code; + private String description; + + AREA_SECTION_TASK_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + /** + * 区域任务状态(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AREA_TASK_STATUS { + CREATE(10, "CREATE", "创建"), + RECEIPT(20, "IN_PROGRESS", "处理中"), + RECEIPT_FINISH(30, "COMPLETED", "已完成"); + + private int value; + private String code; + private String description; + + AREA_TASK_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 区域任务类型(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AREA_TASK_TYPE { + CREATE(10, "JIT_TASK", "JIT任务"), + RECEIPT(20, "DOCUMENT_TASK", "单据任务"), + RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务"); + + private int value; + private String code; + private String description; + + AREA_TASK_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index e0a78cc..e7b8cd0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -5030,4 +5030,39 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * 同批次条码-查询范围 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUERY_RANGE_TYPE { + LOCATE(10, "库位"), AREA_OWNER(20, "责任区域"); + + private int value; + private String description; + + QUERY_RANGE_TYPE(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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 936d73e..103be31 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1,23 +1,21 @@ package cn.estsh.i3plus.pojo.base.jpa.daoimpl; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; -import cn.estsh.i3plus.pojo.base.util.BeanMapUtils; -import cn.estsh.i3plus.pojo.base.util.StringCastUtils; import cn.estsh.i3plus.pojo.base.util.StringUtil; import org.apache.commons.lang3.StringUtils; import org.hibernate.NonUniqueResultException; -import org.hibernate.SQLQuery; -import org.hibernate.transform.Transformers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.jpa.repository.support.SimpleJpaRepository; -import javax.persistence.*; +import javax.persistence.EntityManager; +import javax.persistence.Id; +import javax.persistence.NoResultException; +import javax.persistence.Query; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -860,7 +858,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep public int findByHqlWhereCount(DdlPackBean packBean) { StringBuffer queryString = new StringBuffer(); queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() - + " as model where 1=1 " + packBean.getPackedHql()); + + " as model where 1=1 " + packBean.getWhereAppend()); Query query = entityManager.createQuery(queryString.toString(), Long.class); for (String key : packBean.getHqlPreparedMap().keySet()) { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index a775b40..41042ca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -55,7 +55,7 @@ public class MesCellFeed extends BaseBean implements Serializable { private String rawSn; @Column(name = "RAW_QTY") - @ApiParam("特殊批次") + @ApiParam("原材料数量") private Double rawQty; @Column(name = "LOT_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java new file mode 100644 index 0000000..809f29c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/3/3 13:14 + * @desc + */ +@Data +public class CellFeedModel { + + private String workCenterCode; + + private String workCellCode; + + private String color; + + private String partNo; + + private String itemPartNo; + + private String qty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 3ab2c36..a0d8eaa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -124,6 +124,15 @@ public class MesPcnHqlPack { return packBean; } + public static DdlPackBean getStationBom(String org,String workCenter,String workCell,String partNo) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(workCenter, "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(workCell, "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(partNo, "partNo", packBean); + DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); + return packBean; + } + /** * 生产工单查询条件封装 * diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java index 0ed78f0..25d55ab 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java @@ -14,7 +14,10 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * @author Wynne.Lu @@ -42,4 +45,16 @@ public class PtlArea extends BaseBean implements Serializable { @ApiParam("区域名称") private String areaName; + @Transient + @ApiParam("区段集合") + private List ptlSectionList=new ArrayList<>(); + + @Transient + @ApiParam("区域名称") + private String name; + + + public String getName() { + return areaName; + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java index 8c44e69..eec1146 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java @@ -11,7 +11,10 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * @author Wynne.Lu @@ -84,4 +87,16 @@ public class PtlAreaSectionTask extends BaseBean implements Serializable { @Column(name = "STATUS") @ApiParam("区段任务状态") private Integer status; + + @Column(name = "SEQ") + @ApiParam("区段任务顺序号") + private Integer seq; + + @Column(name = "qty") + @ApiParam("数量") + private Integer qty; + + @ApiParam("区域任务明细") + @Transient + private List ptlAreaSectionTaskDetailList=new ArrayList<>(); } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java index 38103b1..1d04433 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java @@ -28,7 +28,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区段亮灯任务明细") public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -7563481752643393714L; + private static final long serialVersionUID = -7563431552643393714L; @Column(name = "SECTION_TASK_NO") @ApiParam("区段任务编号") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java index c2949dd..64e3c64 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java @@ -88,4 +88,8 @@ public class PtlAreaTask extends BaseBean implements Serializable { @Column(name = "STATUS") @ApiParam("任务状态") private Integer status; + + @Column(name = "qty") + @ApiParam("数量") + private Integer qty; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java similarity index 95% rename from modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java rename to modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java index 1c842e1..b9e661b 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java @@ -25,9 +25,9 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "PTL_PCN_NODE") +@Table(name = "PTL_PCN") @Api("PCN节点") -public class PtlNode extends BaseBean implements Serializable { +public class PtlPcn extends BaseBean implements Serializable { private static final long serialVersionUID = -9140094723555406392L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java new file mode 100644 index 0000000..05d5c88 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java @@ -0,0 +1,56 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-22-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_CONNECT_LOG") +@Api("PCN节点连接日志") +public class PtlPcnConnectLog extends BaseBean implements Serializable { + private static final long serialVersionUID = 2756240593256441951L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "PCN_NAME") + @ApiParam("PCN名称") + private String pcnName; + + @Column(name = "PCN_VERSION") + @ApiParam("PCN版本") + private String pcnVersion; + + @Column(name = "CONNECT_IP") + @ApiParam("连接IP") + private String connectIp; + + @Column(name = "IS_CONNECT") + @ApiParam("是否连接") + private Integer isConnect; + + @Column(name = "REMARK") + @ApiParam("备注") + private String Remark; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java index 451d554..ef380a9 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -52,4 +53,11 @@ public class PtlSection extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; + @Transient + @ApiParam("区域名称") + private String name; + + public String getName() { + return sectionName; + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index 5ead0fb..48d3a70 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -107,4 +107,9 @@ public class PtlTag extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer errorCount; + @Column(name = "CUSTOM_ATTRIBUTE") + @ApiParam("自定义属性") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String customAttribute; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java index d4b869c..4e8713a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.ptl.bean.PtlNode; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcn; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface PtlNodeRepository extends BaseRepository { +public interface PtlNodeRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnConnectLogRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnConnectLogRepository.java new file mode 100644 index 0000000..fb45c82 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnConnectLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnConnectLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnConnectLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnRepository.java new file mode 100644 index 0000000..6ee2933 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcn; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskLogRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskLogRepository.java new file mode 100644 index 0000000..149a856 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnTaskLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Repository +public interface PtlPcnTaskLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 9e9cfcc..39fec2c 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.ptl.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.ptl.bean.*; @@ -83,9 +84,9 @@ public class PtlHqlPack { public static DdlPackBean packHqlPtlPrintingQueueByPrintNo(PtlPrintingQueue ptlPrintingQueue) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result); + DdlPreparedPack.getNumEqualPack(PtlPcnEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result); DdlPreparedPack.getStringLikerPack(ptlPrintingQueue.getPrintNo(), "printNo", result); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result); + DdlPreparedPack.getNumEqualPack(PtlPcnEnumUtil.PRINT_TYPE.PART_NO.getValue(), "printType", result); getStringBuilderPack(ptlPrintingQueue, result); @@ -148,7 +149,7 @@ public class PtlHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getPtlPcnByCondition(PtlNode ptlPcn, String organizeCode) { + public static DdlPackBean getPtlPcnByCondition(PtlPcn ptlPcn, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(ptlPcn.getConnectIp())) { DdlPreparedPack.getStringLikerPack(ptlPcn.getConnectIp(), "connectIp", packBean); @@ -217,4 +218,91 @@ public class PtlHqlPack { } return packBean; } + + /** + * 区域任务主表 + * + * @param ptlAreaTask 区域任务主表 + * @return + */ + public static DdlPackBean packPtlAreaTask(PtlAreaTask ptlAreaTask) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskNo(), "taskNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getPartNo(), "partNo", result); + if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeStart()) + && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd() + , "createDatetime", result, true); + } + DdlPreparedPack.getNumEqualPack(ptlAreaTask.getStatus(), "status", result); + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskType(), "taskType", result); + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(ptlAreaTask.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); + return result; + } + + /** + * 主任务表 + * + * @param ptlMainTask 主任务表 + * @return + */ + public static DdlPackBean packPtlMainTask(PtlMainTask ptlMainTask) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskNo(), "taskNo", result); + DdlPreparedPack.getStringEqualPack(ptlMainTask.getPartNo(), "partNo", result); + if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeStart()) + && org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(ptlMainTask.getCreateDateTimeStart(), ptlMainTask.getCreateDateTimeEnd() + , "createDatetime", result, true); + } + DdlPreparedPack.getNumEqualPack(ptlMainTask.getStatus(), "status", result); + DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskType(), "taskType", result); + DdlPreparedPack.getStringEqualPack(ptlMainTask.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(ptlMainTask.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); + return result; + } + /** + * 区段 + * + * @param ptlAreaSectionTask 区段任务 + * @return + */ + public static DdlPackBean packPtlAreaSectionTask(PtlAreaSectionTask ptlAreaSectionTask) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getPartNo(), "partNo", result); + if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeStart()) + && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(ptlAreaSectionTask.getCreateDateTimeStart(), ptlAreaSectionTask.getCreateDateTimeEnd() + , "createDatetime", result, true); + } + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaNo(), "areaNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getSectionNo(), "sectionNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); + return result; + } + + /** + * 区段任务明细 + * + * @param ptlAreaSectionTaskDetail 区段任务明细 + * @return + */ + public static DdlPackBean packPtlAreaSectionTaskDetail(PtlAreaSectionTaskDetail ptlAreaSectionTaskDetail) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTaskDetail.getSectionTaskNo(), "sectionTaskNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTaskDetail.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(ptlAreaSectionTaskDetail.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); + return result; + } }