Merge remote-tracking branch 'origin/test' into test

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -435,6 +435,35 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
         this.andonCount = andonCount;
     }
 
+    /**
+     * 工位统计报表查询 构造函数
+     * @param workCenterCode
+     * @param workCenterNameRdd
+     * @param workCellCode
+     * @param workCellNameRdd
+     * @param equipmentCode
+     * @param equipmentNameRdd
+     * @param shiftCode
+     * @param shiftNameRdd
+     * @param alarmCode
+     * @param andonCount
+     */
+    public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellNameRdd,String workCellCode,
+                            String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd,
+                            String alarmCode, Long andonCount) {
+        this.workCenterCode = workCenterCode;
+        this.workCenterNameRdd = workCenterNameRdd;
+        this.workCellNameRdd = workCellNameRdd;
+        this.workCellCode = workCellCode;
+        this.equipmentCode = equipmentCode;
+        this.equipmentNameRdd = equipmentNameRdd;
+        this.shiftCode = shiftCode;
+        this.shiftNameRdd = shiftNameRdd;
+        this.alarmCode = alarmCode;
+        this.andonCount = andonCount;
+    }
+
+
     public static void main(String[] args) {
         try {
             List ds = new ArrayList();

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -8243,4 +8243,49 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DELIVER_ORDER_MOVE_TYPE {
+        SHIPING(10, "发运"),
+        ALLOCATION(20, "发运&调拨");
+
+        private int value;
+        private String description;
+
+        DELIVER_ORDER_MOVE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static MesEnumUtil.DELIVER_ORDER_MOVE_TYPE getByValue(Integer value) {
+            for (MesEnumUtil.DELIVER_ORDER_MOVE_TYPE showSupplierCode : values()) {
+                if (showSupplierCode.getValue() == value) {
+                    return showSupplierCode;
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -1460,7 +1460,8 @@ public class MesPcnEnumUtil {
     public enum WC_CHECK_TYPE {
         MATERIAL(10, "MATERIAL", "物料"),
         ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"),
-        WORK_ORDER(30, "WORK_ORDER", "工单信息");
+        WORK_ORDER(30, "WORK_ORDER", "工单信息"),
+        CLOSE(40, "CLOSE", "关闭开线检查");
 
         private int value;
         private String code;
@@ -6097,4 +6098,54 @@ public class MesPcnEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 扭矩枪版本
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TORQUE_VERSION {
+        PF6_2_0("PF6-2.0", "002000010030    00  \0", "PF6 2.0"),
+        PF6_3_0("PF6-3.0", "002000010060    00  \0", "PF6 3.0");
+
+        private String value;
+        private String code;
+        private String description;
+
+        TORQUE_VERSION(String code, String value, String description) {
+            this.code = code;
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static TORQUE_VERSION getByCode(String code) {
+            for (TORQUE_VERSION torqueVersion : values()) {
+                if (torqueVersion.getCode().equals(code)) {
+                    return torqueVersion;
+                }
+            }
+            return null;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java

@@ -816,4 +816,102 @@ public class PtlEnumUtil {
         }
     }
 
+    /**
+     * 完成器音乐枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FINISH_TAG_LIGHT_MUSIC_CMD {
+        FINISH_TAG_LIGHT_MUSIC_00H("00", 1, "Jingle bells"),
+        FINISH_TAG_LIGHT_MUSIC_01H("01", 2, "Carmen"),
+        FINISH_TAG_LIGHT_MUSIC_02H("02", 3, "Happy Chinese new year"),
+        FINISH_TAG_LIGHT_MUSIC_03H("03", 4, "Edelweiss"),
+        FINISH_TAG_LIGHT_MUSIC_04H("04", 5, "Going home"),
+        FINISH_TAG_LIGHT_MUSIC_05H("05", 6, "PAPALA"),
+        FINISH_TAG_LIGHT_MUSIC_06H("06", 7, "Classical"),
+        FINISH_TAG_LIGHT_MUSIC_07H("07", 8, "Listen to the rhythm of the falling rain"),
+        FINISH_TAG_LIGHT_MUSIC_08H("08", 9, "Rock and roll"),
+        FINISH_TAG_LIGHT_MUSIC_09H("09", 10, "Happy birthday"),
+        FINISH_TAG_LIGHT_MUSIC_0AH("0A", 11, "Do Re Me"),
+        FINISH_TAG_LIGHT_MUSIC_0BH("0B", 12, "Strauss");
+
+        private String code;
+        private Integer value;
+        private String description;
+
+        FINISH_TAG_LIGHT_MUSIC_CMD(String code, Integer value, String description) {
+            this.code = code;
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
+    /**
+     * 标签显示器亮灯颜色枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TAG_LIGHT_COLOR_CMD {
+        TAG_LIGHT_COLOR_RED("00", 1, "红"),
+        TAG_LIGHT_COLOR_GREEN("01", 2, "绿"),
+        TAG_LIGHT_COLOR_ORANGE("02", 3, "橙"),
+        TAG_LIGHT_COLOR_BLUE("03", 4, "蓝"),
+        TAG_LIGHT_COLOR_PINK_RED("04", 5, "粉红"),
+        TAG_LIGHT_COLOR_BLUE_GREEN("05", 6, "蓝绿");
+
+        private String code;
+        private Integer value;
+        private String description;
+
+        TAG_LIGHT_COLOR_CMD(String code, Integer value, String description) {
+            this.code = code;
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -9163,11 +9163,11 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum RC_BOARD_STATUS {
-        FINISH(10, "已完成(绿色)"),
+        FINISH(10, "已完成"),//绿色
-        OVER_TIME(20, "已超时（红色）"),
+        OVER_TIME(20, "已超时"),//红色
-        UNRECEIVED(30, "未收货（蓝色）"),
+        UNRECEIVED(30, "未收货"),//蓝色
-        VARIANT(40, "有差异（黄色）"),
+        VARIANT(40, "有差异"),//黄色
-        NORMAL(50, "正常（白色）");
+        NORMAL(50, "正常");//白色
 
         private int value;
         private String description;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.List;
@@ -159,10 +160,16 @@ public class BfElement extends BaseBean {
     @ApiParam(value ="默认排序规则")
     private Integer elementSortAttrType;
 
+    @Lob
     @Column(name="ELEMENT_CSS_STYLE")
     @ApiParam(value ="元素样式")
     private String elementCssStyle;
 
+    @Lob
+    @Column(name="ELEMENT_FORMATTER")
+    @ApiParam(value ="元素样式")
+    private String elementFormatter;
+
     @Column(name="ELEMENT_DESCRIPTION")
     @ApiParam(value ="元素描述")
     private String elementDescription;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java

@@ -48,6 +48,10 @@ public class IfDeliverOrderData extends BaseBean implements Serializable {
     @ApiParam("发运数量")
     private Integer qty = 0;
 
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    private Integer moveType;
+
     @Column(name = "SYNC_STATUS")
     @ApiParam("同步状态")
     private Integer syncStatus;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAnalysisRule.java

@@ -0,0 +1,44 @@
+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 java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: dominic
+ * @Date: 2020/12/03 20:29
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_ANALYSIS_RULE")
+@Api("MES_解析规则")
+public class MesAnalysisRule extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5274274774653791153L;
+
+    @Column(name = "RULE_CODE")
+    @ApiParam("规则代码")
+    private String ruleCode;
+
+    @Column(name = "ANALYSIS_RULE_CODE")
+    @ApiParam("解析规则")
+    private String analysisRuleCode;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java

@@ -0,0 +1,43 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Description :BP业务对比表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-11-06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_BP_BUSINESS")
+@Api("BP业务对比表")
+public class MesBpBusiness extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 855289009053666347L;
+
+    @Column(name = "YEAR")
+    @ApiParam("年")
+    private Integer year;
+
+    @Column(name = "MONTH")
+    @ApiParam("月")
+    private Integer month;
+
+    @Column(name = "QTY")
+    @ApiParam("预测数量")
+    private Double qty = 0d;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java

@@ -5,16 +5,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
@@ -62,4 +58,12 @@ public class MesCustomerPart extends BaseBean implements Serializable {
     @Column(name = "CUSTOMER_CFG_CODE")
     @ApiParam("客户配置代码")
     private String customerCfgCode;
+
+    @Column(name = "CUSTOMER_MARK")
+    @ApiParam("客户代号")
+    private String customerMark;
+
+    @Column(name = "CUSTOMER_LATCH")
+    @ApiParam("客户抬头")
+    private String customerLatch;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java

@@ -119,6 +119,22 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("产品二维码")
     private String productSn;
 
+    @Transient
+    @ApiParam("措施代码")
+    private String repairCode;
+
+    @Transient
+    @ApiParam("措施描述")
+    private String repairName;
+
+    @Transient
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @Transient
+    @ApiParam("缺陷原因描述")
+    private String dcName;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }
@@ -149,4 +165,33 @@ public class MesDefectRecord extends BaseBean implements Serializable {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
     }
+
+    public MesDefectRecord(Long id, String serialNumber, String workOrderNo, String partNo, String partName, String defectCode,
+                           String defectName, String defectLocation, String sideLocation, Integer repairStatus, String workCenterCode,
+                           String workCellCode, String memo, String defectActionType, Double qty, String repairCode, String repairName,
+                           String dcCode, String dcName, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.id = id;
+        this.serialNumber = serialNumber;
+        this.workOrderNo = workOrderNo;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.defectLocation = defectLocation;
+        this.sideLocation = sideLocation;
+        this.repairStatus = repairStatus;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.memo = memo;
+        this.defectActionType = defectActionType;
+        this.qty = qty;
+        this.repairCode = repairCode;
+        this.repairName = repairName;
+        this.dcCode = dcCode;
+        this.dcName = dcName;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java

@@ -55,6 +55,10 @@ public class MesLoopQcGenerateDetail extends BaseBean implements Serializable {
     @ApiParam("末次时间")
     private String lastTime;
 
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
     @ApiParam(value = "物料号")
     @Transient
     private String partNo;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java

@@ -239,7 +239,17 @@ public class MesPackage extends BaseBean implements Serializable {
         this.createDatetime = createDatetime;
     }
 
-    public MesPackage(String partNo, String partNameRdd,String workCenterCode, String workOrderNo,
+    public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, Integer isSealed, String ctNo) {
+        this.packageNo = packageNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.packSpecQty = packSpecQty;
+        this.isSealed = isSealed;
+        this.ctNo = ctNo;
+    }
+
+    public MesPackage(String partNo, String partNameRdd, String workCenterCode, String workOrderNo,
                       String packageNo, String lotNo, String custCode, String shiftGroup) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java

@@ -0,0 +1,76 @@
+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.Index;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/12/10 5:39 PM
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PACKAGE_QUEUE", indexes = {
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "CT_NO")
+})
+@Api("MES_包装队列")
+public class MesPackageQueue extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7427832962272134299L;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编码")
+    private String packageNo;
+
+    @Column(name = "CT_NO")
+    @ApiParam("容器编号")
+    private String ctNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameAdd;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批号")
+    private String lotNo;
+
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam("特殊批号")
+    private String fixLotNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "SEQ", columnDefinition = "decimal(18,8)")
+    @ApiParam("排序")
+    private Double seq;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java

@@ -177,4 +177,8 @@ public class MesPart extends BaseBean implements Serializable {
     @Transient
     @ApiParam("客户零件号")
     private String custPartNo;
+
+    @Transient
+    @ApiParam("是否绑定关键件")
+    private Integer isBingKey;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartAnalysisRule.java

@@ -0,0 +1,40 @@
+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 java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: dominic
+ * @Date: 2020/12/03 20:29
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_ANALYSIS_RULE")
+@Api("MES_物料解析规则配置")
+public class MesPartAnalysisRule extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7877300316848838443L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "RULE_CODE")
+    @ApiParam("规则代码")
+    private String ruleCode;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java

@@ -149,6 +149,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String memo;
 
+    @Transient
+    @ApiParam("序号")
+    private Integer seq;
+
     public MesQcCheckStandard() {
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java

@@ -122,6 +122,10 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
     @ApiParam("检测值配置编号")
     private String checkCfgNo;
 
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
     @Transient
     @ApiParam("判定结果")
     private Integer checkResult = 0;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java

@@ -121,4 +121,8 @@ public class MesQualityStandard extends BaseBean implements Serializable {
     @ApiParam("检测值配置编号")
     private String checkCfgNo;
 
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java

@@ -97,7 +97,7 @@ public class MesRepairRecord extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String spareMemo;
 
-    @Transient
+    @Column(name = "DEFECT_RECORD_ID")
     @ApiParam("不良记录id")
     private Long defectRecordId;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -207,6 +207,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam(value = "乐观锁", example = "1")
     public Integer lockVersion;
 
+    @Column(name = "SORT_SEQ")
+    @ApiParam("排序序号")
+    private String sortSeq;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: 业务队列model
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2020-06-28-11:44
+ * @Modify:
+ **/
+@Data
+public class BusiQueueDispatchModel<T> {
+
+    @ApiParam("实现类")
+    private Object busDispatchervice;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("key")
+    private String key;
+
+    @ApiParam("数据")
+    private Object Obj;
+
+    @ApiParam("信息")
+    private String info;
+
+    @ApiParam("集合")
+    private List<T> list;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java

@@ -27,4 +27,10 @@ public class LogisticsBiModel implements Serializable {
 
     @ApiParam(value = "月份")
     private Integer month;
+
+    @ApiParam(value = "实际出库数量")
+    private double outQty = 0;
+
+    @ApiParam(value = "BP总数")
+    private double bpQty= 0;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java

@@ -130,4 +130,8 @@ public class MesControlPlanTemplateModel extends BaseBean {
     @AnnoOutputColumn
     private String checkCfgNo;
 
+    @ApiParam("序号")
+    @AnnoOutputColumn
+    private Integer seq;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java

@@ -20,12 +20,12 @@ public class MesPackageQueryModel extends MesPackage {
     @ApiParam("工序名称")
     private String processName;
 
+    @ApiParam("工位")
+    private String workCellName;
+
     @ApiParam("产线")
     private String workCenterName;
 
-    @ApiParam("工作单元名称")
-    private String workCellName;
-
     @ApiParam("是否封箱Name")
     private String isSealedName;
 
@@ -34,7 +34,14 @@ public class MesPackageQueryModel extends MesPackage {
         this.workCellName = workCellName;
     }
 
-    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName) {
+    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, Integer isSealed, String ctNo, String processName, String workCellName, String workCenterName) {
+        super(packageNo, partNo, partNameRdd, qty, packSpecQty, isSealed, ctNo);
+        this.processName = processName;
+        this.workCellName = workCellName;
+        this.workCenterName = workCenterName;
+    }
+
+    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo, String processName, String workCenterName, String workCellName) {
         super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo);
         this.processName=processName;
         this.workCenterName = workCenterName;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java

@@ -80,4 +80,7 @@ public class MesQualityStandardModel {
 
     @ApiParam("检测值配置编号")
     private String checkCfgNo;
+
+    @ApiParam("序号")
+    private Integer seq;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java

@@ -138,6 +138,8 @@ public class StepPrintSnModel extends MesProduceSn {
     private String jitSeq;
     @ApiParam("产品位置名称")
     private String produceCategoryName;
+    @ApiParam("配置代码")
+    private String cfgCode;
 
     @ApiParam("版本号")
     private String versionNo;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 产品工序过程查询-条件
+ * @author yumingxing
+ * @version 1.0
+ * @date 2021/1/10 11:02
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("产品工序过程查询-条件")
+public class ConditionQueryModel {
+
+    @ApiParam("项目名称")
+    private String prodCfgTypeCode;
+
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+    @ApiParam("开始时间")
+    private String modifyStartDate;
+
+    @ApiParam("结束时间")
+    private String modifyEndDate;
+
+    @ApiParam("零件二维码")
+    private String serialNumber;
+
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java

@@ -13,17 +13,22 @@ import java.io.Serializable;
  * @date 2020/12/18 15:16
  **/
 @Data
-@ApiModel("产品履历报表-缺陷信息")
+@ApiModel("产品工序过程查询-缺陷信息")
 public class DefectRecordModel implements Serializable {
 
     private static final long serialVersionUID = 4994719388513997046L;
 
+    @ApiParam("产线")
+    private String workCenterName;
 
-    @ApiParam("不良处理类型")
+    @ApiParam("工序名称")
-    private Integer defectActionType;
+    private String processName;
 
-    @ApiParam("不良处理类型名称")
+    @ApiParam("质量代码")
-    private String defectActionTypeName;
+    private Integer qcStatus;
+
+    @ApiParam("质量状态")
+    private String qcStatusName;
 
     @ApiParam("缺陷名称")
     private String defectName;
@@ -34,10 +39,28 @@ public class DefectRecordModel implements Serializable {
     @ApiParam("缺陷位置名称")
     private String defectLocationName;
 
-    @ApiParam(value = "创建用户")
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+    @ApiParam("零件二维码")
+    private String serialNumber;
+
+    @ApiParam(value = "执行人")
     public String createUser;
 
-    @ApiParam(value = "创建日期")
+    @ApiParam(value = "扫描时间")
     public String createDatetime;
 
+
+    public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) {
+        this.workCenterName = workCenterName;
+        this.processName = processName;
+        this.qcStatus = qcStatus;
+        this.defectName = defectName;
+        this.defectLocation = defectLocation;
+        this.customerPartNo = customerPartNo;
+        this.serialNumber = serialNumber;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java

@@ -20,57 +20,65 @@ public class PackageTravelModel implements Serializable {
 
     private static final long serialVersionUID = -7031472442162953544L;
 
+    @ApiParam("客户零件号")
+    private String packageNo;
 
-    @ApiParam("过程条码")
+    @ApiParam("客户零件号")
-    private String serialNumber;
+    private String customerPartNo;
 
-    @ApiParam("料箱编号")
+    @ApiParam("零件二维码")
-    private String ctNo;
+    private String serialNumber;
 
-    @ApiParam("包装号")
+    @ApiParam("CMS零件号")
-    private String packageNo;
+    private String partNo;
 
-    @ApiParam("料箱类型")
+    @ApiParam("CMS标签号")
-    private String cnCode;
+    private String qrCode;
 
-    @ApiParam("料箱状态")
+    @ApiParam("产线")
-    private String useStatus;
+    private String workCenterName;
 
-    @ApiParam("料箱状态名称")
+    @ApiParam("工序名称")
-    private String useStatusName;
+    private String processName;
 
-    @ApiParam("物料码")
+    @ApiParam("料架类型")
-    private String partNo;
+    private String ctCode;
 
-    @ApiParam("物料名称")
+    @ApiParam("料架编号")
-    private String partNameRdd;
+    private String ctNo;
 
-    @ApiParam("产线")
+    @ApiParam("进炉模式")
-    private String workCenterCode;
+    private String modelNo;
 
-    @ApiParam("工序信息")
+    @ApiParam("炉内料架位置")
-    private String processCode;
+    private String fnLocationNo;
 
-    @ApiParam("执行动作")
+    @ApiParam("层位置")
-    private Integer opType;
+    private String ctLocationNo;
 
-    @ApiParam("执行动作名称")
+    @ApiParam("层内零件位置")
-    private String opTypeName;
+    private String ctLocationPartNo;
 
     @ApiParam("执行时间")
     private String createDatetime;
 
-    public PackageTravelModel(String serialNumber, String ctNo, String packageNo, String cnCode, String useStatus, String partNo, String partNameRdd, String workCenterCode, String processCode, Integer opType, String createDatetime) {
+    @ApiParam("执行时间")
-        this.serialNumber = serialNumber;
+    private String createUser;
-        this.ctNo = ctNo;
+
+    public PackageTravelModel(String packageNo,String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String ctCode, String ctNo, String modelNo, String fnLocationNo, String ctLocationNo, String createDatetime, String createUser) {
         this.packageNo = packageNo;
-        this.cnCode = cnCode;
+        this.customerPartNo = customerPartNo;
-        this.useStatus = useStatus;
+        this.serialNumber = serialNumber;
         this.partNo = partNo;
-        this.partNameRdd = partNameRdd;
+        this.qrCode = qrCode;
-        this.workCenterCode = workCenterCode;
+        this.workCenterName = workCenterName;
-        this.processCode = processCode;
+        this.processName = processName;
-        this.opType = opType;
+        this.ctCode = ctCode;
+        this.ctNo = ctNo;
+        this.modelNo = modelNo;
+        this.fnLocationNo = fnLocationNo;
+        this.ctLocationNo = ctLocationNo;
         this.createDatetime = createDatetime;
+        this.createUser = createUser;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProdCustPartModel.java

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author yumingxing
+ * @version 1.0
+ * @date 2021/1/9 14:29
+ **/
+@ApiModel("项目号零件号")
+@Data
+
+public class ProdCustPartModel {
+
+    @ApiParam("项目号")
+    private String prodCfgTypeCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+    public ProdCustPartModel(String prodCfgTypeCode, String partNo, String customerPartNo) {
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java

@@ -12,19 +12,19 @@ import java.util.List;
 /**
  * @Author: xiangming.liao
  * @CreateDate: 2020/12/28 14:24 下午
- * @Description: 一次性通过率占比柏拉图报表model
+ * @Description: 缺陷率占比柏拉图报表model
  **/
-@Api("一次性通过率占比柏拉图报表model")
+@Api("缺陷率占比柏拉图报表model")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ProduceDispPassPlatoModel {
+public class ProduceDefectRatePlatoModel {
 
     @ApiParam("项目号")
     private String prodCfgTypeCode;
 
-    @ApiParam("零件号")
+    @ApiParam("客户零件号")
-    private String partNo;
+    private String customerPartNo;
 
     @ApiParam("缺陷代码")
     private String defectCode;
@@ -41,17 +41,17 @@ public class ProduceDispPassPlatoModel {
     @ApiParam("数量")
     private Long qty;
 
-    public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, String defectCode, String defectName, Long qty) {
+    public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, String defectCode, String defectName, Long qty) {
         this.prodCfgTypeCode = prodCfgTypeCode;
-        this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
         this.defectCode = defectCode;
         this.defectName = defectName;
         this.qty = qty;
     }
 
-    public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, Long qty) {
+    public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, Long qty) {
         this.prodCfgTypeCode = prodCfgTypeCode;
-        this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
         this.qty = qty;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoQueryModel.java

@@ -12,19 +12,22 @@ import java.util.List;
 /**
  * @Author: xiangming.liao
  * @CreateDate: 2020/12/28 14:18 下午
- * @Description: 一次性通过率占比柏拉图报表查询参数model
+ * @Description: 缺陷率占比柏拉图报表查询参数model
  **/
-@Api("一次性通过率占比柏拉图报表查询参数model")
+@Api("缺陷率占比柏拉图报表查询参数model")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ProduceDispPassPlatoQueryModel extends BaseBean {
+public class ProduceDefectRatePlatoQueryModel extends BaseBean {
     /**
      * 必选
      */
 
     @ApiParam("工序")
-    private List<String> processCodeList;
+    private String processCode;
+
+    @ApiParam("柱子展示条数")
+    private Integer displaySize;
 
     //质量状态（20冻结，30报废）
     @ApiParam("质量状态")
@@ -38,7 +41,7 @@ public class ProduceDispPassPlatoQueryModel extends BaseBean {
     @ApiParam("零件号")
     private List<String> partNoList;
 
-    //统计方式（0按月，1按天）
+    //统计方式（0按月，1按天。）
     @ApiParam("统计方式")
     private Integer statisticalMethod;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductDetailResult.java

@@ -21,6 +21,9 @@ public class ProductDetailResult {
     @ApiParam("零件号")
     private String partNo;
 
+    @ApiParam
+    private String customerPartNo;
+
     @ApiParam("零件描述")
     private String partNameRdd;
 
@@ -48,10 +51,14 @@ public class ProductDetailResult {
     @ApiParam(value = "修改日期")
     public String modifyDatetime;
 
+    @ApiParam(value = "生产线名称")
+    public String workCenterName;
+
 
-    public ProductDetailResult(String serialNumber, String partNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+    public ProductDetailResult(String serialNumber, String partNo,String customerPartNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime,String workCenterName) {
         this.serialNumber = serialNumber;
         this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
         this.partNameRdd = partNameRdd;
         this.workCenterCode = workCenterCode;
         this.processCode = processCode;
@@ -61,5 +68,6 @@ public class ProductDetailResult {
         this.createDatetime = createDatetime;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
+        this.workCenterName = workCenterName;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductResult.java

@@ -19,6 +19,8 @@ public class ProductResult {
     private String workCellCode;
     @ApiParam("零件号")
     private String partNo;
+    @ApiParam("零件号")
+    private String customerPartNo;
     @ApiParam("零件描述")
     private String partNameRdd;
     @ApiParam("生产线")
@@ -41,10 +43,13 @@ public class ProductResult {
     private BigDecimal unqualifiedRate;
     @ApiParam("报废率")
     private BigDecimal scrapRate;
+    @ApiParam("生产线名称")
+    private String workCenterName;
 
-    public ProductResult(String workCellCode,String partNo, String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap) {
+    public ProductResult(String workCellCode,String partNo, String customerPartNo,String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap,String workCenterName) {
         this.workCellCode = workCellCode;
         this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
         this.partNameRdd = partNameRdd;
         this.workCenterCode = workCenterCode;
         this.processCode = processCode;
@@ -52,5 +57,6 @@ public class ProductResult {
         this.qualified = qualified;
         this.unqualified = unqualified;
         this.scrap = scrap;
+        this.workCenterName = workCenterName;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnConditionModel.java

@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 产品履历报表-产品信息
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/18 15:16
+ **/
+@Data
+@ApiModel("产品工序过程查询-条件查询页面")
+public class ProductSnConditionModel implements Serializable {
+
+    private static final long serialVersionUID = 3154899794523800804L;
+
+    @ApiParam("零件二维码")
+    private String serialNumber;
+
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+    @ApiParam("CMS零件号")
+    private String partNo;
+
+    @ApiParam("项目名称")
+    private String prodCfgTypeCode;
+
+    @ApiParam("产线")
+    private String workCenterName;
+
+    @ApiParam("工序名称")
+    private String processName;
+
+    @ApiParam("工位名称")
+    private String workCellName;
+
+    @ApiParam(value = "扫码时间")
+    public String createDatetime;
+
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @ApiParam("质量状态Name")
+    private String qcStatusName;
+
+    public ProductSnConditionModel(String serialNumber, String customerPartNo, String partNo, String prodCfgTypeCode, String workCenterName, String processName, String workCellName, String createDatetime, Integer qcStatus) {
+        this.serialNumber = serialNumber;
+        this.customerPartNo = customerPartNo;
+        this.partNo = partNo;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.workCenterName = workCenterName;
+        this.processName = processName;
+        this.workCellName = workCellName;
+        this.createDatetime = createDatetime;
+        this.qcStatus = qcStatus;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java

@@ -16,47 +16,53 @@ import java.io.Serializable;
 @ApiModel("产品履历报表-产品信息")
 public class ProductSnModel implements Serializable {
 
-    private static final long serialVersionUID = 5217363746963291483L;
+    private static final long serialVersionUID = 7137684552464509466L;
 
 
-    @ApiParam("过程条码")
+    @ApiParam("客户零件号")
-    private String serialNumber;
+    private String customerPartNo;
-
-    @ApiParam("条码状态")
-    private Integer snStatus;
-
-    @ApiParam("条码状态Name")
-    private String snStatusName;
-
-    @ApiParam("质量状态")
-    private Integer qcStatus;
 
-    @ApiParam("质量状态Name")
+    @ApiParam("零件二维码")
-    private String qcStatusName;
+    private String serialNumber;
 
-    @ApiParam("物料码")
+    @ApiParam("CMS零件号")
     private String partNo;
 
-    @ApiParam("物料名称")
+    @ApiParam("CMS标签号")
-    private String partNameRdd;
+    private String qrCode;
 
     @ApiParam("产线")
-    private String workCenterCode;
+    private String workCenterName;
+
+    @ApiParam("工序名称")
+    private String processName;
 
-    @ApiParam("流程代码")
+    @ApiParam("工位名称")
-    private String routeCode;
+    private String workCellName;
 
-    @ApiParam("当前工序")
+    @ApiParam(value = "扫码时间")
-    private String processCode;
+    public String createDatetime;
 
-    @ApiParam("条码类型")
+    @ApiParam(value = "执行人")
-    private Integer snType;
+    public String createUser;
 
-    @ApiParam("条码类型Name")
+    @ApiParam("质量代码")
-    private String snTypeName;
+    private Integer qcStatus;
 
+    @ApiParam("质量状态")
+    private String qcStatusName;
 
-    @ApiParam(value = "执行时间")
-    public String modifyDatetime;
 
+    public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String workCellName, String createDatetime, String createUser, Integer qcStatus) {
+        this.customerPartNo = customerPartNo;
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.qrCode = qrCode;
+        this.workCenterName = workCenterName;
+        this.processName = processName;
+        this.workCellName = workCellName;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.qcStatus = qcStatus;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ReportQueryModel.java

@@ -20,9 +20,6 @@ public class ReportQueryModel {
     @ApiParam("项目号")
     private List<String> prodCfgTypeCodeList;
 
-    /**
-     * 零件号取物料号
-     */
     @ApiParam("零件号")
     private List<String> partNoList;
 
@@ -38,4 +35,7 @@ public class ReportQueryModel {
     @ApiParam("姓名")
     private String userName;
 
+    @ApiParam("单个工序")
+    private String singleProcessCode;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java

@@ -22,6 +22,8 @@ public class ScrapOfPlatoModel {
 
     @ApiParam("零件号")
     private String partNo;
+    @ApiParam("客户零件号")
+    private String customerPartNo;
     @ApiParam("项目")
     private String prodCfgTypeCode;
     @ApiParam("缺陷代码")
@@ -41,8 +43,9 @@ public class ScrapOfPlatoModel {
     private BigDecimal scrapRatioPlato;
 
 
-    public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects) {
+    public ScrapOfPlatoModel(String partNo, String customerPartNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects) {
         this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.defectCode = defectCode;
         this.defectName = defectName;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAnalysisRuleRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesAnalysisRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: dominic
+ * @Date: 2020/12/03 20:29
+ * @Modify:
+ */
+@Repository
+public interface MesAnalysisRuleRepository extends BaseRepository<MesAnalysisRule, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBpBusiness;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MesBpBusinessRepository extends BaseRepository<MesBpBusiness, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPackageQueue;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/12/10 5:40 PM
+ * @Modify:
+ */
+@Repository
+public interface MesPackageQueueRepository extends BaseRepository<MesPackageQueue, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartAnalysisRuleRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartAnalysisRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: dominic
+ * @Date: 2020/12/03 20:29
+ * @Modify:
+ */
+@Repository
+public interface MesPartAnalysisRuleRepository extends BaseRepository<MesPartAnalysisRule, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2220,9 +2220,6 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(defectRecord.getWorkOrderNo())) {
             DdlPreparedPack.getStringEqualPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean);
         }
-        if (!StringUtils.isEmpty(defectRecord.getProductSn())) {
-            DdlPreparedPack.getStringEqualPack(defectRecord.getProductSn(), "productSn", packBean);
-        }
         if (!StringUtils.isEmpty(defectRecord.getRepairStatus())) {
             DdlPreparedPack.getNumEqualPack(defectRecord.getRepairStatus(), "repairStatus", packBean);
         }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java

@@ -375,4 +375,47 @@ public class PtlHqlPack {
         DdlPreparedPack.getNumEqualPack(pickData.getSyncFlag(), "syncFlag", packBean);
         return packBean;
     }
+
+    /**
+     * 区段
+     * @param section
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getPtlSection(PtlSection section, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(section, organizeCode);
+        DdlPreparedPack.getStringLikerPack(section.getAreaNo(), "areaNo", packBean);
+        DdlPreparedPack.getStringLikerPack(section.getSectionNo(), "sectionNo", packBean);
+        DdlPreparedPack.getStringLikerPack(section.getSectionName(), "sectionName", packBean);
+        return packBean;
+    }
+
+    /**
+     * 控制器
+     * @param control
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getPtlControl(PtlControl control, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(control, organizeCode);
+        DdlPreparedPack.getStringLikerPack(control.getAreaNo(), "areaNo", packBean);
+        DdlPreparedPack.getStringLikerPack(control.getControlNo(), "controlNo", packBean);
+        DdlPreparedPack.getStringLikerPack(control.getControlName(), "controlName", packBean);
+        DdlPreparedPack.getNumEqualPack(control.getControlType(), "controlType", packBean);
+        return packBean;
+    }
+
+    /**
+     * 物料
+     * @param part
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getPtlPart(PtlPart part, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode);
+        DdlPreparedPack.getStringLikerPack(part.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean);
+        DdlPreparedPack.getStringEqualPack(part.getPartType(), "partType", packBean);
+        return packBean;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java

@@ -9,14 +9,19 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description :移库单明细实体(用于转储类业务)
@@ -387,6 +392,12 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "目的库位名称")
     public String destLocateName;
 
+    @Transient
+    @ApiParam("报废类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer scrapType;
+
+
 
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
@@ -740,9 +751,9 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.destLocateName = locateName;
     }
 
-    public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo,Integer moveType, Integer busiType,
+    public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo, Integer moveType, Integer busiType,
-                                 String item, String partNo, String partNameRdd,String unit, Double qty,
+                                 String item, String partNo, String partNameRdd, String unit, Double qty,
-                                 Integer isSn, Integer orderMasterStatus,String createUser, String createDatetime) {
+                                 Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime, String seqNo) {
         this.organizeCode = organizeCode;
         this.workOrderCode = workOrderCode;
         this.orderNo = orderNo;
@@ -757,5 +768,21 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.orderMasterStatus = orderMasterStatus;
         this.createUser = createUser;
         this.createDatetime = createDatetime;
+        this.seqNo = seqNo;
+    }
+
+    public WmsDocMovementDetails(String orderNo, String partNo, String custPartNo, String srcZoneNo, String destZoneNo, String destLocateNo, Double qty, Double pickQty, String createDatetime, Integer orderStatus, String createUser) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.custPartNo = custPartNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.destLocateNo = destLocateNo;
+        this.qty = qty;
+        this.pickQty = pickQty;
+        this.createDatetime = createDatetime;
+        this.orderStatus = orderStatus;
+        this.createUser = createUser;
+
     }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java

@@ -34,25 +34,21 @@ import javax.persistence.Table;
 @Inheritance(strategy = InheritanceType.JOINED)
 @Api(value = "物流费用管理")
 public class WmsLogisticsCosts extends BaseBean {
-
     private static final long serialVersionUID = -5307311210847854654L;
-    @Column(name = "ORGANIZE_NAME")
+
-    @ApiParam(value = "工厂名称")
+    @Column(name = "TRANSPORT_TYPE")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    @ApiParam(value = "运输类型")
-    private String organizeName;
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class)
+    private Integer transportType;
 
     @Column(name = "PLACE_OF_ORIGIN")
-    @ApiParam(value = "发出地")
+    @ApiParam(value = "发出地存储区")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String placeOfOrigin;
 
-    @Column(name = "DESTINATION_WAREHOUSE")
-    @ApiParam(value = "目的仓库")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private String destinationWarehouse;
-
     @Column(name = "SHIPPING_FLAG")
-    @ApiParam(value = "发往地")
+    @ApiParam(value = "发往地存储区")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String shippingFlag;
 
@@ -61,16 +57,26 @@ public class WmsLogisticsCosts extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String logisticsVendorNo;
 
+    @Column(name = "part_no")
+    @ApiParam(value = "物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "part_name")
+    @ApiParam(value = "物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partName;
+
     @Column(name = "SALES_UNIT")
     @ApiParam(value = "计价单位")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String salesUnit;
 
-    @Column(name = "TRANSPORT_TYPE")
+    @Column(name = "TRANSPORT_MODE")
     @ApiParam(value = "运输方式")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
     @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
-    private Integer transportType;
+    private Integer transportMode;
 
     @Column(name = "price")
     @ApiParam(value = "单价")
@@ -83,7 +89,7 @@ public class WmsLogisticsCosts extends BaseBean {
     private String startDate;
 
     @Column(name = "END_DATE")
-    @ApiParam(value = "结束日期")
+    @ApiParam(value = "失效日期")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String endDate;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java

@@ -1,18 +1,13 @@
 package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
 
-import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
 
 /**
  * @Description : ERP COGI快照
@@ -34,7 +29,7 @@ import javax.persistence.Table;
         @Index(columnList = "SNAPSHOT_TIME"),
         @Index(columnList = "MOVE_TYPE")
 })
-public class WmsErpCOGISnapshot extends SnapshotBean {
+public class WmsErpCOGISnapshot extends BaseBean {
     private static final long serialVersionUID = -4095222692227226944L;
 
     @Column(name="SNAPSHOT_TIME")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java

@@ -1,18 +1,13 @@
 package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
 
-import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
 
 /**
  * @Description : ERP 报文接口快照
@@ -34,7 +29,7 @@ import javax.persistence.Table;
         @Index(columnList = "RECEIVER"),
         @Index(columnList = "SNAPSHOT_TIME")
 })
-public class WmsErpInterfaceSnapshot extends SnapshotBean {
+public class WmsErpInterfaceSnapshot extends BaseBean {
     private static final long serialVersionUID = -4095333692227226944L;
 
     @Column(name="SNAPSHOT_TIME")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java

@@ -1,18 +1,13 @@
 package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
 
-import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
 
 /**
  * @Description : ERP 库存结余快照
@@ -33,7 +28,7 @@ import javax.persistence.Table;
         @Index(columnList = "ORGANIZE_CODE"),
         @Index(columnList = "SNAPSHOT_TIME")
 })
-public class WmsErpStockQuanSnapshot extends SnapshotBean {
+public class WmsErpStockQuanSnapshot extends BaseBean {
     private static final long serialVersionUID = -4095444692227226944L;
 
     @Column(name="SNAPSHOT_TIME")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java

@@ -1,18 +1,13 @@
 package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
 
-import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
 
 /**
  * @Description : ERP 交易快照
@@ -35,7 +30,7 @@ import javax.persistence.Table;
         @Index(columnList = "SNAPSHOT_TIME"),
         @Index(columnList = "MOVE_TYPE")
 })
-public class WmsErpTransSnapshot extends SnapshotBean {
+public class WmsErpTransSnapshot extends BaseBean {
     private static final long serialVersionUID = -4095555692227226944L;
 
     @Column(name="SNAPSHOT_TIME")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java

@@ -13,7 +13,9 @@ public class WmsInterfaceEnumUtil {
         SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"),
         SWEB2SAP(50, "SWEB2SAP", "SWEB --> SAP"),
         WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"),
-        SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB");
+        SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"),
+        SAP2MES(60, "SAP2MES", "SAP --> WMS"),
+        ;
 
         private int value;
         private String name;