添加条码校验逻辑+工步跳转代码优化+数据同步BUG修改

6 years ago · e9b1d7e595
parent 13af329513
commit e9b1d7e595
6 changed files with 253 additions and 27 deletions
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java
@ -27,18 +27,18 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name="MES_PROCESS_BOM")
+@Table(name = "MES_PROCESS_BOM")
@Api("工序物料清单")
 public class MesProcessBom extends BaseBean {
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
    @ApiParam("零件号")
    private String partNo;

-    @Column(name="PROCESS_CODE")
+    @Column(name = "PROCESS_CODE")
    @ApiParam("工序代码")
    private String processCode;

-    @Column(name="ITEM_PART_NO")
+    @Column(name = "ITEM_PART_NO")
    @ApiParam("子零件")
    private String itemPartNo;

@ -57,7 +57,7 @@ public class MesProcessBom extends BaseBean {

    @Transient
    @ApiParam("是否已绑定")
-    private boolean isBind;
+    private Boolean isBind;

    @Transient
    @ApiParam("显示颜色")
@ -69,10 +69,42 @@ public class MesProcessBom extends BaseBean {
    }

    public int getIsRepeatVal() {
-        return  this.isRepeat == null ? 0 : this.isRepeat;
+        return this.isRepeat == null ? 0 : this.isRepeat;
    }

    public int getIsCheckVal() {
        return this.isCheck == null ? 0 : this.isCheck;
    }
+
+    public boolean getIsBindVal() {
+        return this.isBind == null ? false : this.isBind;
+    }
+
+    @Override
+    public String toString() {
+        return "MesProcessBom{" +
+                "partNo='" + partNo + '\'' +
+                ", processCode='" + processCode + '\'' +
+                ", itemPartNo='" + itemPartNo + '\'' +
+                ", qty=" + qty +
+                ", isRepeat=" + isRepeat +
+                ", isCheck=" + isCheck +
+                ", isBind=" + isBind +
+                ", color='" + color + '\'' +
+                ", id=" + id +
+                ", organizeCode='" + organizeCode + '\'' +
+                ", isValid=" + isValid +
+                ", isDeleted=" + isDeleted +
+                ", createUser='" + createUser + '\'' +
+                ", createDatetime='" + createDatetime + '\'' +
+                ", modifyUser='" + modifyUser + '\'' +
+                ", modifyDatetime='" + modifyDatetime + '\'' +
+                ", createDateTimeStart='" + createDateTimeStart + '\'' +
+                ", createDateTimeEnd='" + createDateTimeEnd + '\'' +
+                ", modifyDateTimeStart='" + modifyDateTimeStart + '\'' +
+                ", modifyDateTimeEnd='" + modifyDateTimeEnd + '\'' +
+                ", orderByParam='" + orderByParam + '\'' +
+                ", ascOrDesc=" + ascOrDesc +
+                '}';
+    }
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java
@ -83,15 +83,18 @@ public class MesStep extends BaseBean {
    @ApiParam("工步是否跳过")
    private boolean isJump;

-//    public MesStep(String stepCode,String stepName,String stepText,String stepType,String stepObject,
-//                   String routeCode,String processCode,Integer stepSeq){
-//        this.stepCode = stepCode;
-//        this.stepName = stepName;
-//        this.stepText = stepText;
-//        this.stepType = stepType;
-//        this.stepObject = stepObject;
-//        this.routeCode = routeCode;
-//        this.processCode = processCode;
-//        this.stepSeq = stepSeq;
-//    }
+    public MesStep() {
+    }
+
+    public MesStep(String stepCode, String stepName, String stepText, String stepType, String stepObject,
+                   String routeCode, String processCode, Integer stepSeq){
+        this.stepCode = stepCode;
+        this.stepName = stepName;
+        this.stepText = stepText;
+        this.stepType = stepType;
+        this.stepObject = stepObject;
+        this.routeCode = routeCode;
+        this.processCode = processCode;
+        this.stepSeq = stepSeq;
+    }
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java
@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;

 /**
@ -56,6 +57,15 @@ public class MesProcessBom extends BaseBean {
    @ApiParam(value = "是否检查")
    private Integer isCheck;

+    @Transient
+    @ApiParam("是否已绑定")
+    private Boolean isBind;
+
+    @Transient
+    @ApiParam("显示颜色")
+    private String color;
+
+
    public double getQtyVal() {
        return this.qty == null ? 0.0d : this.qty;
    }
@ -67,4 +77,36 @@ public class MesProcessBom extends BaseBean {
    public int getIsCheckVal() {
        return this.isCheck == null ? 0 : this.isCheck;
    }
+
+    public boolean getIsBindVal() {
+        return this.isBind == null ? false : this.isBind;
+    }
+
+    @Override
+    public String toString() {
+        return "MesProcessBom{" +
+                "partNo='" + partNo + '\'' +
+                ", processCode='" + processCode + '\'' +
+                ", itemPartNo='" + itemPartNo + '\'' +
+                ", qty=" + qty +
+                ", isRepeat=" + isRepeat +
+                ", isCheck=" + isCheck +
+                ", isBind=" + isBind +
+                ", color='" + color + '\'' +
+                ", id=" + id +
+                ", organizeCode='" + organizeCode + '\'' +
+                ", isValid=" + isValid +
+                ", isDeleted=" + isDeleted +
+                ", createUser='" + createUser + '\'' +
+                ", createDatetime='" + createDatetime + '\'' +
+                ", modifyUser='" + modifyUser + '\'' +
+                ", modifyDatetime='" + modifyDatetime + '\'' +
+                ", createDateTimeStart='" + createDateTimeStart + '\'' +
+                ", createDateTimeEnd='" + createDateTimeEnd + '\'' +
+                ", modifyDateTimeStart='" + modifyDateTimeStart + '\'' +
+                ", modifyDateTimeEnd='" + modifyDateTimeEnd + '\'' +
+                ", orderByParam='" + orderByParam + '\'' +
+                ", ascOrDesc=" + ascOrDesc +
+                '}';
+    }
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@ -132,4 +132,31 @@ public class MesProduceSn extends BaseBean {
    public int getPrintStatusVal() {
        return this.printStatus == null ? 0 : this.printStatus;
    }
+
+    @Override
+    public String toString() {
+        return "MesProduceSn{" +
+                "serialNumber='" + serialNumber + '\'' +
+                ", partNo='" + partNo + '\'' +
+                ", partNameRdd='" + partNameRdd + '\'' +
+                ", qty=" + qty +
+                ", qcStatus=" + qcStatus +
+                ", snStatus=" + snStatus +
+                ", printCount=" + printCount +
+                ", printStatus=" + printStatus +
+                ", workCenterCode='" + workCenterCode + '\'' +
+                ", workCellCode='" + workCellCode + '\'' +
+                ", routeCode='" + routeCode + '\'' +
+                ", processCode='" + processCode + '\'' +
+                ", nextProcessCode='" + nextProcessCode + '\'' +
+                ", inWorkCenterTime='" + inWorkCenterTime + '\'' +
+                ", outWorkCenterTime='" + outWorkCenterTime + '\'' +
+                ", shippingTime='" + shippingTime + '\'' +
+                ", workOrderNo='" + workOrderNo + '\'' +
+                ", custSn='" + custSn + '\'' +
+                ", custPartNo='" + custPartNo + '\'' +
+                ", packageSn='" + packageSn + '\'' +
+                ", resultMsg='" + resultMsg + '\'' +
+                '}';
+    }
 }
--- 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
@ -1,21 +1,25 @@
 package cn.estsh.i3plus.pojo.mes.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: 
-**/
+ * @Description : 产品条码履历实体类
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-05-29 16:22
+ * @Modify:
+ **/
@Data
@Entity
@DynamicInsert
@ -23,5 +27,108 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PRODUCE_SN_TRAVEL")
@Api("产品条码履历表")
-public class MesProduceSnTravel extends MesProduceSn {
+public class MesProduceSnTravel extends BaseBean {
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name="QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name="QC_STATUS")
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @Column(name="SN_STATUS")
+    @ApiParam("条码状态")
+    private Integer snStatus;
+
+    @Column(name="PRINT_COUNT")
+    @ApiParam("打印次数")
+    private Integer printCount;
+
+    @Column(name="PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name="PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name="NEXT_PROCESS_CODE")
+    @ApiParam("下一工序代码")
+    private String nextProcessCode;
+
+    @Column(name="IN_WC_TIME")
+    @ApiParam("进产线时间")
+    private String inWorkCenterTime;
+
+    @Column(name="OUT_WC_TIME")
+    @ApiParam("出产线时间")
+    private String outWorkCenterTime;
+
+    @Column(name="SHIPPING_TIME")
+    @ApiParam("发运时间")
+    private String shippingTime;
+
+    @Column(name="WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name="CUST_SN")
+    @ApiParam("客户条码")
+    private String custSn;
+
+    @Column(name="CUST_PART_NO")
+    @ApiParam("客户零件号")
+    private String custPartNo;
+
+    @Column(name="PACKAGE_SN")
+    @ApiParam("包装条码")
+    private String packageSn;
+
+    @Transient
+    @ApiParam("返回信息")
+    private String resultMsg;
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public int getQcStatusVal() {
+        return this.qcStatus == null ? 0 : this.qcStatus;
+    }
+
+    public int getSnStatusVal() {
+        return this.snStatus == null ? 0 : this.snStatus;
+    }
+
+    public int getPrintCountVal() {
+        return this.printCount == null ? 0 : this.printCount;
+    }
+
+    public int getPrintStatusVal() {
+        return this.printStatus == null ? 0 : this.printStatus;
+    }
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepModel.java
@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.pcn.model;
+package cn.estsh.i3plus.pojo.model.mes;

 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -51,9 +51,22 @@ public class StepModel implements Serializable {
     */
    @ApiParam("工步是否跳过")
    private boolean isJump;
+    /**
+     * 参数代码
+     */
+    @ApiParam("参数代码")
+    private String paramCode;
+    /**
+     * 工作单元代码
+     */
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    public StepModel() {
+    }

-        public StepModel(String stepCode,String stepName,String stepText,String stepType,String stepObject,
-                   String routeCode,String processCode,Integer stepSeq){
+    public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject,
+                     String routeCode, String processCode, Integer stepSeq, String paramCode, String workCellCode) {
        this.stepCode = stepCode;
        this.stepName = stepName;
        this.stepText = stepText;
@ -62,5 +75,7 @@ public class StepModel implements Serializable {
        this.routeCode = routeCode;
        this.processCode = processCode;
        this.stepSeq = stepSeq;
+        this.paramCode = paramCode;
+        this.workCellCode = workCellCode;
    }
 }