diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index 26f776b..1e8371e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -226,15 +226,15 @@ public class AndonManageQueue extends BaseBean { @Transient @ApiParam(value = "ANDON次数（用于报表统计）", example = "0") - private Integer andonCount; + private Long andonCount; @Transient @ApiParam(value = "平均响应时长", example = "0") - private Long avgSignTime; + private Double avgSignTime; @Transient @ApiParam(value = "平均解决时长", example = "0") - private Long avgResolveTime; + private Double avgResolveTime; @Transient @ApiParam(value = "查询条件：ANDON状态") @@ -244,6 +244,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "比例", example = "0") private Double proportion; + @Transient + @ApiParam(value = "总次数（用于报表统计）", example = "0") + private Integer sumCount; + @Column(name = "SEND_FLAG") @ApiParam(value = "发送标志") private String sendFlag; @@ -257,4 +261,85 @@ public class AndonManageQueue extends BaseBean { public Integer getPriorityLevel() { return this.priorityLevel == null ? 0 : this.priorityLevel; } + + /** + * 工位统计 构造函数 + * @param workCenterCode + * @param workCellCode + * @param equipmentCode + * @param shiftCode + * @param alarmCode + * @param andonCount + */ + public AndonManageQueue(String workCenterCode, String workCellCode, String equipmentCode, String shiftCode, String alarmCode, Long andonCount) { + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.equipmentCode = equipmentCode; + this.shiftCode = shiftCode; + this.alarmCode = alarmCode; + this.andonCount = andonCount; + } + + /** + * 原因统计 使用Java内存计算（获取原始数据） + * @param workCenterCode + * @param workCellCode + * @param alarmCode + * @param ecCode + * @param ecNameRdd + * @param emCode + * @param emNameRdd + * @param callTime + * @param confirmTime + * @param resetTime + */ + public AndonManageQueue(String workCenterCode,String workCellCode,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){ + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.alarmCode = alarmCode; + this.ecCode = ecCode; + this.ecNameRdd = ecNameRdd; + this.emCode = emCode; + this.emNameRdd = emNameRdd; + this.callTime = callTime; + this.confirmTime = confirmTime; + this.resetTime = resetTime; + } + + /** + * 人员统计 使用Java内存计算（获取原始数据） + * @param resetUser + * @param alarmCode + * @param callTime + * @param confirmTime + * @param resetTime + */ + public AndonManageQueue(String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){ + this.resetUser = resetUser; + this.alarmCode = alarmCode; + this.callTime = callTime; + this.confirmTime = confirmTime; + this.resetTime = resetTime; + } + + /** + * 统计分析柏拉图 使用JAVA内存计算（获取原始数据） + * @param alarmCode + * @param ecCode + * @param ecNameRdd + * @param callTime + * @param confirmTime + * @param resetTime + */ + public AndonManageQueue(String alarmCode,String ecCode, String ecNameRdd, String callTime, String confirmTime,String resetTime){ + this.ecNameRdd = ecNameRdd; + this.ecCode = ecCode; + this.alarmCode = alarmCode; + this.callTime = callTime; + this.confirmTime = confirmTime; + this.resetTime = resetTime; + } + + public AndonManageQueue() { + } } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java index 05c7e9d..eb0887c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java @@ -130,14 +130,26 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "呼叫人") private String callUser; + @Transient + @ApiParam(value = "呼叫人名字") + private String callUserName; + @Column(name = "CONFIRM_USER") @ApiParam(value = "响应人") private String confirmUser; + @Transient + @ApiParam(value = "响应人名字") + private String confirmUserName; + @Column(name = "RESET_USER") @ApiParam(value = "解决人") private String resetUser; + @Transient + @ApiParam(value = "解决人名字") + private String resetUserName; + @Column(name = "IS_SHIFT_CALL") @ApiParam(value = "是否转呼", example = "1") private Integer isShiftCall; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index ec7d5c4..d98d25d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -54,9 +54,9 @@ public class AndonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_BUSI_FLAG{ - ALARM_FLAG("10","按灯状态"), - USER_CODE("20","工号"), - READ_FLAG("30", "读取状态"); + ALARM_FLAG("10","安灯呼叫标识"), + USER_CODE("20","用户工号"), + READ_FLAG("30", "安灯读取状态"); private String value; private String description; @@ -192,11 +192,11 @@ public class AndonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_CODE{ - PART("MM","物料"), - QUALITY("QM","质量"), - EQUIP("EQ","设备"), - PROCESS("GY","工艺"), - CHECK("JC","检测"); + PART("PART_ALARM","物料"), + QUALITY("QUALITY_ALARM","质量"), + EQUIP("EQUMENT_ALARM","设备"), + PROCESS("ROUTING_ALARM","工艺"), + CHECK("OTHER_ALARM","其他"); private String value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 8ffa732..09be175 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -352,7 +352,7 @@ public class MesEnumUtil { CREATE(10,"创建"), PROCESS(20,"加工"), - OFFLINE(30,"上线"), + OFFLINE(30,"下线"), INSTOCKED(40,"入库"), SHIPING(50,"发运"), CLOSE(90,"关闭"),; 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 a11ca7c..912baec 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 @@ -915,7 +915,7 @@ public class WmsEnumUtil { private int value; private String description; - CS_ORDER_TYPE(int value, String description) { + CS_ORDER_TYPE(int value,String description) { this.value = value; this.description = description; } @@ -944,18 +944,20 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_ORDER_STATUS { - CREATE(10, "创建"), - STARTING_INVENTORY(20, "开启盘点"), - IN_INVENTORY(30, "盘点中"), - INVENTORY_FINISH(40, "盘点完成"), - THAWING(50, "已解冻"), - CLOSED(60, "已关闭"); + CREATE(10,"CREATE", "创建"), + STARTING_INVENTORY(20,"STARTING_INVENTORY", "开启盘点"), + IN_INVENTORY(30,"IN_INVENTORY", "盘点中"), + INVENTORY_FINISH(40,"INVENTORY_FINISH", "盘点完成"), + THAWING(50,"THAWING", "已解冻"), + CLOSED(60, "CLOSED","已关闭"); private int value; + private String code; private String description; - CS_ORDER_STATUS(int value, String description) { + CS_ORDER_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -963,6 +965,10 @@ public class WmsEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index e5c6ecc..1b6d43a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -466,7 +466,7 @@ public class DdlPreparedPack { data += "'" + dataArray[i] + "',"; } } - packBean.addColumnQuery(columnName," and." + columnName + " not in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data); } } @@ -479,7 +479,7 @@ public class DdlPreparedPack { */ public static void getNotInPack(String data, String columnName, DdlPackBean packBean) { if (data != null && data.trim().length() > 0) { - packBean.addColumnQuery(columnName," and." + columnName + " not in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data); } } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java index 26675f7..dd3034b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -39,6 +40,14 @@ public class MesQueueOrder extends BaseBean { @ApiParam("客户标识号") private String custFlagNo; + @Column(name="PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name="PROD_CFG_NAME_RDD") + @ApiParam("产品配置名称") + private String prodCfgNameRdd; + @Column(name="SEQ") @ApiParam("排序") private Double seq; @@ -59,11 +68,19 @@ public class MesQueueOrder extends BaseBean { @ApiParam("区域代码") private String areaCode; + @Transient + @ApiParam("起始车号") + private String custFlagNoStart; + + @Transient + @ApiParam("截至车号") + private String custFlagNoEnd; + public int getStatusVal() { return this.status == null ? 0 : this.status; } - public double getSeq() { + public double getSeqVal() { return this.seq == null ? 0.0d : this.seq; } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index 91149c5..d32d1cf 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -57,12 +57,15 @@ public class MesQueueOrderDetail extends BaseBean { @Column(name="WORK_TYPE") @ApiParam("生产类型") - private String workOrderType; + private String workType; - @Column(name="PRODUCE_CATEGORY") - @ApiParam("产品类型") - private String produceCategory; + @Column(name="PRODUCE_CATEGORY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + @Column(name="PRODUCE_CATEGORY_NAME_RDD") + @ApiParam("产品类型名称") + private String produceCategoryNameRdd; public double getSeqVal() { return this.seq == null ? 0.0d : this.seq; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java new file mode 100644 index 0000000..0b2bdb3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Description : 工站队列 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-22 17:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_POINT") +@Api("工站队列") +public class MesWorkCellPoint extends BaseBean { + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "QUEUE_SEQ") + @ApiParam("队列主表序号") + private String queueSeq; + + @Column(name = "QUEUE_DETAIL_SEQ") + @ApiParam("队列明细表序号") + private String queueDetailSeq; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java new file mode 100644 index 0000000..11b8373 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : JIT队列列表Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-22 16:34 + * @Modify: + **/ +@Data +@Api("JIT队列列表Model") +public class QueueOrderModel implements Serializable { + @ApiParam("队列序号") + public Double queueSeq; + @ApiParam("队列明细序号") + public Double queDetailSeq; + @ApiParam("客户标识号") + public String custFlagNo; + @ApiParam("产品配置名称") + public String prodCfgNameRdd; + @ApiParam("产品类型名称") + public String categoryNameRdd; + @ApiParam("产品条码") + public String serialNumber; + @ApiParam("物料号") + public String partNo; + @ApiParam("物料名称") + public String partNameRdd; + @ApiParam("条码状态") + public Integer snStatus; + @ApiParam("生产类型") + public String workType; + @Transient + @ApiParam("显示颜色") + private String color; + public QueueOrderModel() { + } + + public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { + 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; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index d6ba7b6..b9a6c36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,12 +10,10 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import java.util.Date; /** * @Description :BOM清单 @@ -71,12 +70,12 @@ public class MesBom extends BaseBean { @Column(name = "EFF_START_TIME") @ApiParam(value = "生效时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam(value = "失效时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private String effEndTime; public double getQtyVal() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 4bb5af7..940e112 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -48,6 +48,10 @@ public class MesQueueOrder extends BaseBean { @ApiParam("产品配置代码") private String prodCfgCode; + @Column(name="PROD_CFG_NAME_RDD") + @ApiParam("产品配置名称") + private String prodCfgNameRdd; + @Column(name="SEQ") @ApiParam("排序") private Double seq; @@ -80,8 +84,8 @@ public class MesQueueOrder extends BaseBean { return this.status == null ? 0 : this.status; } - public double getSeq() { + public double getSeqVal() { return this.seq == null ? 0.0d : this.seq; } - + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 14bb9bb..d8ee647 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -59,10 +59,13 @@ public class MesQueueOrderDetail extends BaseBean { @ApiParam("生产类型") private String workOrderType; - @Column(name="PRODUCE_CATEGORY") - @ApiParam("产品类型") - private String produceCategory; + @Column(name="PRODUCE_CATEGORY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + @Column(name="PRODUCE_CATEGORY_NAME_RDD") + @ApiParam("产品类型名称") + private String produceCategoryNameRdd; public double getSeqVal() { return this.seq == null ? 0.0d : this.seq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java new file mode 100644 index 0000000..603ff15 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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 javax.persistence.Transient; +import java.util.List; + +/** + * @Description : 工站队列 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-22 17:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_POINT") +@Api("工站队列") +public class MesWorkCellPoint extends BaseBean { + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "QUEUE_SEQ") + @ApiParam("队列主表序号") + private String queueSeq; + + @Column(name = "QUEUE_DETAIL_SEQ") + @ApiParam("队列明细表序号") + private String queueDetailSeq; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteModel.java similarity index 78% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteModel.java index 46163cf..670a8bc 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteModel.java @@ -1,7 +1,5 @@ -package cn.estsh.i3plus.pojo.model.mes; +package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess; -import cn.estsh.i3plus.pojo.model.wms.WmsActionGroupDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteProcessModel.java similarity index 91% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteProcessModel.java index 14a8d46..1ce5e08 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteProcessModel.java @@ -1,9 +1,8 @@ -package cn.estsh.i3plus.pojo.model.mes; +package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteOptParam; import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess; import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessStep; -import cn.estsh.i3plus.pojo.wms.bean.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java new file mode 100644 index 0000000..f2dd1e2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.List; + +/** + * @Description : JIT队列列表Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-22 16:34 + * @Modify: + **/ +@Data +@Api("JIT队列列表Model") +public class QueueOrderModel implements Serializable { + @ApiParam("队列序号") + public Double queueSeq; + @ApiParam("队列明细序号") + public Double queDetailSeq; + @ApiParam("客户标识号") + public String custFlagNo; + @ApiParam("产品配置名称") + public String prodCfgNameRdd; + @ApiParam("产品类型名称") + public String categoryNameRdd; + @ApiParam("产品条码") + public String serialNumber; + @ApiParam("物料号") + public String partNo; + @ApiParam("物料名称") + public String partNameRdd; + @ApiParam("条码状态") + public Integer snStatus; + @ApiParam("生产类型") + public String workType; + @Transient + @ApiParam("显示颜色") + private String color; + public QueueOrderModel() { + } + + public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { + 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; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 06b8339..a11e846 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -663,6 +663,9 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(packSpec.getSpecName())){ DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean); } + if (StringUtils.isNotEmpty(packSpec.getParentSpec())){ + DdlPreparedPack.getStringEqualPack(packSpec.getParentSpec(), "parentSpec", packBean); + } return packBean; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java deleted file mode 100644 index 6880ac3..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.estsh.i3plus.pojo.model.mes; - -import cn.estsh.i3plus.pojo.mes.bean.MesArea; -import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; -import io.swagger.annotations.ApiParam; - -import javax.persistence.Transient; -import java.util.List; - -public class SysOrganizeModel extends SysOrganize{ - - @Transient - @ApiParam(value ="子集列表") - private List childTreeList; - - public List getChildTreeList() { - return childTreeList; - } - - public void setChildTreeList(List childTreeList) { - this.childTreeList = childTreeList; - } -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index c729338..5b60a92 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -382,6 +382,7 @@ public class CoreHqlPack { HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); + HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); if(user.getRoleIdList() != null){ HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result); @@ -493,6 +494,7 @@ public class CoreHqlPack { // HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result); HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); + HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){ HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result); diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index d075fdf..18df792 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -186,4 +186,8 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Transient @ApiParam(value = "关联单号") private String refOrderNo; + + @Transient + @ApiParam(value = "条码") + private String barCode; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 9bfe0df..f57e852 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.SwebEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.sweb.bean.*; import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel; import org.apache.commons.lang3.StringUtils; @@ -71,6 +72,25 @@ public class SwebHqlPack { return buildHql(swebConfig, result); } + + // DdlPackBean方法中的 getNumNOEqualPack（） 方法存在问题，所有先用 HqlPack + public static String getPurchaseOrderDetailsWhereHqlByItemStatus(SwebPOForPubListEnterModel model) { + StringBuffer result = new StringBuffer(); + HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.CREATE.getValue(),"itemStatus",result); + HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result); + + HqlPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); + HqlPack.getNumEqualPack(model.getOrderType(), "orderType", result); + HqlPack.getStringEqualPack(model.getPartNo(), "partNo", result); + // 封装有效状态和删除状态 + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getStringEqualPack(model.getOrganizeCode(), "organizeCode", result); + HqlPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return result.toString(); + } + public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 28139af..48c1efe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -10,10 +10,7 @@ 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 javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 作业流程 @@ -67,6 +64,7 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "任务自动初始化", example = "0") private Integer autoInit; + @Lob @Column(name = "POSITION") @ApiParam(value = "GOJS位置") private String position;