WMS【添加“重新推送未处理的移动单到队列”接口+BUG修复：定时处理错误移动单查询移动单没有加上工厂代码+QC推送队列直接放了一整个对象导致交易处理主程序无法解析】MES【JIT队列execute方法+条码校验工步】

6 years ago · ae4b32251a
parent a558020d32
commit ae4b32251a
8 changed files with 154 additions and 11 deletions
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java
@ -0,0 +1,31 @@
+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;
+import javax.persistence.Transient;
+
+/**
+* @Description : 产品条码履历实体类
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2019-05-29 16:22
+* @Modify: 
+**/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PRODUCE_SN_TRAVEL")
+@Api("产品条码履历表")
+public class MesProduceSnTravel extends MesProduceSn {
+}
--- 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
@ -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:
@ -24,48 +25,57 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name="MES_QUEUE_ORDER_DETAIL")
+@Table(name = "MES_QUEUE_ORDER_DETAIL")
@Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean {
-    @Column(name="ORDER_NO")
+    @Column(name = "ORDER_NO")
    @ApiParam("主队列编号")
    private String orderNo;

-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
    @ApiParam("物料号")
    private String partNo;

-    @Column(name="PART_NAME_RDD")
+    @Column(name = "PART_NAME_RDD")
    @ApiParam("物料名称")
    private String partNameRdd;

-    @Column(name="SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER")
    @ApiParam("产品条码")
    private String serialNumber;

-    @Column(name="SEQ")
+    @Column(name = "SEQ")
    @ApiParam("队列明细序号")
    private Double seq;

-    @Column(name="QTY")
+    @Column(name = "QTY")
    @ApiParam("数量")
    private Double qty;

-    @Column(name="STATUS")
+    @Column(name = "STATUS")
    @ApiParam("状态")
    private Integer status;

-    @Column(name="WORK_TYPE")
+    @Column(name = "WORK_TYPE")
    @ApiParam("生产类型")
    private String workType;

-    @Column(name="PRODUCE_CATEGORY_CODE")
+    @Column(name = "PRODUCE_CATEGORY_CODE")
    @ApiParam("产品类型代码")
    private String produceCategoryCode;

-    @Column(name="PRODUCE_CATEGORY_NAME_RDD")
+    @Column(name = "PRODUCE_CATEGORY_NAME_RDD")
    @ApiParam("产品类型名称")
    private String produceCategoryNameRdd;
+
+    @Transient
+    @ApiParam("队列序号")
+    private Double queueSeq;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0.0d : this.queueSeq;
+    }
+
    public double getSeqVal() {
        return this.seq == null ? 0.0d : this.seq;
    }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java
@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSnTravel;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 条码履历Dao层接口
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2019-05-29 16:36
+* @Modify: 
+**/
+@Repository
+public interface MesProduceSnTravelRepository extends BaseRepository<MesProduceSnTravel, Long> {
+}
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java
@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellPoint;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :工站队列Dao层接口
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-05-29 14:40
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellPointRepository extends BaseRepository<MesWorkCellPoint, Long> {
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import io.swagger.annotations.Api;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+* @Description : 产品条码履历实体类
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2019-05-29 16:22
+* @Modify: 
+**/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PRODUCE_SN_TRAVEL")
+@Api("产品条码履历表")
+public class MesProduceSnTravel extends MesProduceSn {
+}
--- 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
@ -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:
@ -66,6 +67,14 @@ public class MesQueueOrderDetail extends BaseBean {
    @Column(name="PRODUCE_CATEGORY_NAME_RDD")
    @ApiParam("产品类型名称")
    private String produceCategoryNameRdd;
+
+    @Transient
+    @ApiParam("队列序号")
+    private Double queueSeq;
+
+    public double getQueueSeqVal() {
+        return this.queueSeq == null ? 0.0d : this.queueSeq;
+    }
    public double getSeqVal() {
        return this.seq == null ? 0.0d : this.seq;
    }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSnTravel;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 条码履历Dao层接口
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2019-05-29 16:36
+* @Modify: 
+**/
+@Repository
+public interface MesProduceSnTravelRepository extends BaseRepository<MesProduceSnTravel, Long> {
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointRepository.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellPoint;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :工站队列Dao层接口
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-05-29 14:40
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellPointRepository extends BaseRepository<MesWorkCellPoint, Long> {
+}