Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -5,15 +5,11 @@ 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.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;
 
 /**
@@ -29,57 +25,57 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name="ANDON_BROADCAST")
+@Table(name = "ANDON_BROADCAST")
 @Api("安灯广播")
 public class AndonBroadCast extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = -5383684820100076411L;
 
-    @Column(name="DEVICE_NUM")
+    @Column(name = "DEVICE_NUM")
     @ApiParam("广播设备编号")
     private String targetIds;
 
-    @Column(name="GROUP_NO")
+    @Column(name = "GROUP_NO")
     @ApiParam("分组号")
     private String groupNo;
 
-    @Column(name="WORK_CENTER_CODE")
+    @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
 
-    @Column(name="DEVICE_DEC")
+    @Column(name = "DEVICE_DEC")
     @ApiParam("广播设备名称")
     private String deviceDec;
 
-    @Column(name="DEVICE_IP")
+    @Column(name = "DEVICE_IP")
     @ApiParam("广播设备ip")
     private String deviceIp;
 
-    @Column(name="PLAY_INTERVAL")
+    @Column(name = "PLAY_INTERVAL")
     @ApiParam("播放间隔")
     private Integer playInterval = 0;
 
-    @Column(name="PLAY_PRIORITY")
+    @Column(name = "PLAY_PRIORITY")
     @ApiParam("播放优先级")
     private Integer playPriority = 500;
 
-    @Column(name="VOLUME")
+    @Column(name = "VOLUME")
     @ApiParam("播放音量")
     private Integer volume;
 
-    @Column(name="TTS_NAME")
+    @Column(name = "TTS_NAME")
     @ApiParam("广播语音引擎")
     private String voiceEngine;
 
-    @Column(name="TEXT_ENCODE")
+    @Column(name = "TEXT_ENCODE")
     @ApiParam("广播内容编码格式")
     private String textEncode = "UTF-8";
 
-    @Column(name="PLAY_SPEED")
+    @Column(name = "PLAY_SPEED", columnDefinition = "decimal(18,8)")
     @ApiParam("播放语速")
-    private Integer playSpeed = 0;
+    private Double playSpeed = 0d;
 
-    @Column(name="PLAY_TIME")
+    @Column(name = "PLAY_TIME")
     @ApiParam("播放循环次数")
     private Integer playTime = 1;
 }

modules/i3plus-pojo-base/pom.xml

@@ -31,10 +31,6 @@
             <artifactId>fastjson</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
         </dependency>

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

@@ -1979,6 +1979,21 @@ public class CommonEnumUtil {
             return null;
         }
 
+        public String getJDBCUrlToMysql(String database, String host, Integer port) {
+            if (this.getValue() == SOURCE_MARIA_DB.getValue()) {
+                return getJDBCUrlMySQLBy8x(database, host, port);
+            } else if (this.getValue() == SOURCE_ORACLE.getValue()) {
+                return getJDBCUrlOracle(database, host, port);
+            } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) {
+                return getJDBCUrlPostgreSQL(database, host, port);
+            } else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) {
+                return getJDBCUrlSQLServer(database, host, port);
+            } else if (this.getValue() == SOURCE_SAP_HANA.getValue()) {
+                return getJDBCUrlSapHana(database, host, port);
+            }
+            return null;
+        }
+
         public String getJDBCUrl(String database, String host, Integer port, String instanceName) {
             if (this.getValue() == SOURCE_MARIA_DB.getValue()) {
                 return getJDBCUrlMySQL(database, host, port);
@@ -2021,6 +2036,16 @@ public class CommonEnumUtil {
                     "&serverTimezone=Asia/Shanghai";
         }
 
+        //MySQL8.x时区设置
+        private String getJDBCUrlMySQLBy8x(String database, String host, Integer port) {
+            return "jdbc:mysql://" + host + ":" + port + "/" + database +
+                    "?autoReconnect=true" +
+                    "&useSSL=false" +
+                    "&characterEncoding=utf-8" +
+                    "&allowPublicKeyRetrieval=true" +
+                    "&serverTimezone=Asia/Shanghai";
+        }
+
         private String getJDBCUrlOracle(String database, String host, Integer port) {
             return "jdbc:oracle:thin:@" + host + ":" + port + ":" + database;
         }

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

@@ -3747,7 +3747,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STATION_REQUEST_BEAN_CMD {
         JUMP_STATE(10, "JUMP_STATE", "跳过状态点"),
-        FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点");
+        FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点"),
+        FORCE_JUMP_PROCESS(30, "FORCE_JUMP_PROCESS", "通过DOSCAN强制跳过工序");
 
         private int value;
         private String code;
@@ -6624,4 +6625,32 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum THA_MONITOR_STATUS {
+        MONITORING(10, "MONITORING", "监听中"),
+        MONITOR_COMPLETE(20, "MONITOR_COMPLETE", "监听完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        THA_MONITOR_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
 }

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

@@ -9216,9 +9216,9 @@ public class WmsEnumUtil {
         TWENTY_SECONDS("0/20 * * * * ?", "TWENTY_SECONDS", "二十秒一次"),
         EVERY_DAY("0 0 0 * * ?", "EVERY_DAY", "每天零点"),
         EVERY_HOUR("0 0 * * * ?", "EVERY_HOUR", "每小时"),
-        NINE_AND_NINTEEN("0 0 9,21 * * ?", "NINE_AND_NINTEEN", "早上九点晚上九点");
+        NINE_AND_NINTEEN("0 0 9,21 * * ?", "NINE_AND_NINTEEN", "早上九点晚上九点"),
-
+        NINE("0 0 9 * * ?", "NINE", "早上九点"),
-
+        NINTEEN("0 0 21 * * ?", "NINTEEN", "晚上九点");
         private String value;
         private String code;
         private String description;

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

@@ -6,16 +6,13 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
+
-import javax.persistence.InheritanceType;
+import javax.persistence.*;
+
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
@@ -29,7 +26,11 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name = "IF_EDI_INITIAL_DATA")
+@Table(name = "IF_EDI_INITIAL_DATA", indexes = {
+        @Index(columnList = "PROGRAM_DATA"),
+        @Index(columnList = "CONTENT"),
+        @Index(columnList = "SYNC_STATUS")
+})
 @Api("EDI_初始数据表")
 public class IfEdiInitialData extends BaseBean implements Serializable {
     private static final long serialVersionUID = -523843818485699827L;

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

@@ -4,17 +4,14 @@ 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 javax.persistence.*;
+
 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.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
@@ -30,7 +27,12 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name = "IF_PACKAGE_DETAIL")
+@Table(name = "IF_PACKAGE_DETAIL", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PART_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "IF_CODE"})
+})
 @Api("包装明细表")
 public class IfPackageDetail extends BaseBean  implements Serializable {
 

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

@@ -0,0 +1,56 @@
+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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 物料校验客户标签关系
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/3/22 13:37
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "IF_PART_CHECK_CUSTOMER_LABEL")
+@Api("IF_物料校验客户标签关系")
+public class IfPartCheckCustomerLabel extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "IS_CHECK")
+    @ApiParam("是否校验")
+    private Integer isCheck;
+
+    @Column(name = "SYNC_STATUS")
+    @ColumnDefault("10")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    @Lob
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}

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

@@ -0,0 +1,56 @@
+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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 物料校验客户标签明细
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/3/22 13:37
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "IF_PART_CHECK_CUSTOMER_LABEL_DETAIL")
+@Api("IF_物料校验客户标签明细")
+public class IfPartCheckCustomerLabelDetail extends BaseBean {
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("托条码")
+    private String packageNo;
+
+    @Column(name = "CUSTOMER_LABEL")
+    @ApiParam("客户标签")
+    private String customerLabel;
+
+    @Column(name = "SYNC_STATUS")
+    @ColumnDefault("10")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    @Lob
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}

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

@@ -63,6 +63,11 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable {
     @ApiParam(value = "是否物理删除", example = "0")
     private Integer isPhysicalDelete;
 
+    //枚举：CommonEnumUtil.DATA_SOURCE_TYPE
+    @Column(name = "DATASOURCE_TYPE")
+    @ApiParam(value = "数据源类型")
+    private Integer dataSourceType;
+
     @Column(name = "LAST_EXECUTION_TIME")
     @ApiParam("末次迁移时间")
     private String lastExecutionTime;

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

@@ -43,7 +43,7 @@ public class MesEquTaskNotifyCfg extends BaseBean implements Serializable {
     private Integer notifyType;
 
     @Column(name="NOTIFY_CONDITION")
-    @ApiParam("通知条件（小时）")
+    @ApiParam("通知条件（分钟）")
     private Integer notifyCondition;
 
     @Column(name="NOTIFY_OBJECT_CODE")

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

@@ -4,15 +4,13 @@ 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 javax.persistence.*;
+
 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;
 
 /**
@@ -27,7 +25,11 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name = "MES_JIT_LOCK_CACHE")
+@Table(name = "MES_JIT_LOCK_CACHE", indexes = {
+        @Index(columnList = "JIT_ACTUAL_NO"),
+        @Index(columnList = "WO_TYPE"),
+        @Index(columnList = "STATUS")
+})
 @Api("MES_JIT队列锁定池")
 public class MesJitLockCache extends BaseBean implements Serializable {
 

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

@@ -4,15 +4,13 @@ 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 javax.persistence.*;
+
 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;
 
 /**
@@ -27,7 +25,11 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name = "MES_JIT_ORDER_CACHE")
+@Table(name = "MES_JIT_ORDER_CACHE", indexes = {
+        @Index(columnList = "JIT_ACTUAL_NO"),
+        @Index(columnList = "WO_TYPE"),
+        @Index(columnList = "STATUS")
+})
 @Api("MES_JIT队列订单池")
 public class MesJitOrderCache extends BaseBean implements Serializable {
     private static final long serialVersionUID = -613326904053045367L;

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

@@ -107,12 +107,32 @@ public class MesKpData extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("实采个数")
-    private Integer actualNum;
+    private Integer actualNum = 0;
 
     @Transient
     @ApiParam("记录颜色")
     private String color;
 
+    @Transient
+    @ApiParam("特殊码")
+    private String specificSn;
+
+    @Transient
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Transient
+    @ApiParam("采集结果")
+    private Integer result;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Transient
+    @ApiParam("数据范围")
+    private String torqueValRange;
+
 
     public double getKeyDataCountVal() {
         return this.keyDataCount == null ? 0 : this.keyDataCount;

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

@@ -0,0 +1,123 @@
+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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :物料关键数据关系记录
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-05-15
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_KP_DATA_RECORD")
+@Api("物料关键数据关系记录")
+public class MesKpDataRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 8243089140216459544L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "KEY_DATA_CODE")
+    @ApiParam("关键数据代码")
+    private String keyDataCode;
+
+    @Column(name = "KEY_DATA_NAME")
+    @ApiParam("关键数据名称")
+    private String keyDataName;
+
+    @Column(name = "KEY_DATA_COUNT")
+    @ApiParam("关键数据数量")
+    private Integer keyDataCount;
+
+    @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("数据上限")
+    private Double upperLimit;
+
+    @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("数据下限")
+    private Double lowerLimit;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "TORQUE_GROUP")
+    @ApiParam("扭矩组")
+    private String torqueGroup;
+
+    @Column(name = "TORQUE_GROUP_SEQ")
+    @ApiParam("扭矩组顺序")
+    private Integer torqueGroupSeq;
+
+    @Column(name = "TORQUE")
+    @ApiParam("扭矩项")
+    private String torque;
+
+    @Column(name = "TORQUE_SEQ")
+    @ApiParam("扭矩项顺序")
+    private Integer torqueSeq;
+
+    @Column(name = "JOB_ID")
+    @ApiParam("JOB_ID")
+    private Integer jobId;
+
+    @Column(name = "LAST_TIGHTENING_ID")
+    @ApiParam("最后一次扭矩id")
+    private Long lastTighteningId;
+
+    @Column(name = "TORQUE_VALUE")
+    @ApiParam("扭矩值")
+    private Double torqueValue;
+
+    @Column(name = "RESULT")
+    @ApiParam("采集结果")
+    private Integer result;
+
+    @Column(name = "ACTUAL_NUM")
+    @ApiParam("实采个数")
+    private Integer actualNum;
+
+    @Column(name = "SPECIFIC_SN")
+    @ApiParam("特殊码")
+    private String specificSn;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+
+    public double getKeyDataCountVal() {
+        return this.keyDataCount == null ? 0 : this.keyDataCount;
+    }
+
+    public double getUpperLimitVal() {
+        return this.upperLimit == null ? 0.0d : this.upperLimit;
+    }
+
+    public double getLowerLimitVal() {
+        return this.lowerLimit == null ? 0.0d : this.lowerLimit;
+    }
+}

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

@@ -207,6 +207,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("工序名称")
     private String processName;
 
+    @Transient
+    @ApiParam("产品条码")
+    private String productSn;
+
     public MesPackage() {
     }
 

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

@@ -73,4 +73,8 @@ public class MesPackageTravel extends BaseBean implements Serializable {
     @Column(name = "FN_LOCATION_NO")
     @ApiParam("炉内位置代码")
     private String fnLocationNo;
+
+    @Column(name = "QR_CODE")
+    @ApiParam("包装二维码")
+    private String qrCode;
 }

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

@@ -146,6 +146,18 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("版本号")
     private String versionNo;
 
+    @Column(name = "VARIANT")
+    @ApiParam("variant")
+    private String variant;
+
+    @Column(name = "PACK_MOTH")
+    @ApiParam("packmoth")
+    private String packMoth;
+
+    @Column(name = "SERIAL_NO")
+    @ApiParam("零件流水号")
+    private String serialNo;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;

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

@@ -0,0 +1,52 @@
+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: 特殊物料
+ * @Author: jokelin
+ * @Date: 2021/3/24 3:10 PM
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_PART_CAR_MODEL")
+@Api("车型零件关系表")
+public class MesPartCarModel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -4039513102671811231L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("零件名称")
+    private String partNameRdd;
+
+    @Column(name = "VEHICLE_CODE")
+    @ApiParam("车型代码")
+    private String vehicleCode;
+
+    @Column(name = "VEHICLE_NAME")
+    @ApiParam("车型名称")
+    private String vehicleName;
+
+    @Column(name = "SERIAL_NO")
+    @ApiParam("车型流水号")
+    private String serialNo;
+
+}

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

@@ -0,0 +1,60 @@
+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: 特殊物料
+ * @Author: jokelin
+ * @Date: 2021/3/24 3:10 PM
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_PART_SPECIFIC")
+@Api("特殊物料关系信息")
+public class MesPartSpecific extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -4039513102671816031L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("父零件号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("父零件名称")
+    private String partName;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("子零件")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam("子零件名称")
+    private String itemPartName;
+
+    @Column(name = "TORQUE_SN")
+    @ApiParam("特殊码")
+    private String specificSn;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+}

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

@@ -248,6 +248,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("组内编号")
     private Integer groupNo;
 
+    @Transient
+    @ApiParam("总数")
+    private long sumQty;
+
     public MesProduceSn() {
     }
 
@@ -257,6 +261,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
         this.qty = qty;
     }
 
+
+    public MesProduceSn(String workCenterCode, String partNo, String partNameRdd, long sumQty) {
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sumQty = sumQty;
+    }
+
     public MesProduceSn(Long id, String serialNumber, String productSn, String partNo, String partNameRdd, Double qty, Integer qcStatus, Integer snStatus,
                         Integer printCount, Integer printStatus, String workCenterCode, String workCellCode, String routeCode, String processCode,
                         String nextProcessCode, String inWorkCenterTime, String outWorkCenterTime, String shippingTime, String workOrderNo,

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

@@ -159,4 +159,8 @@ public class MesQcOrder extends BaseBean implements Serializable {
     @Transient
     @ApiParam("班长")
     private String squadLeader;
+
+    @Transient
+    @ApiParam("质检单集合")
+    private List<String> orderNoList;
 }

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

@@ -17,6 +17,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -78,11 +79,11 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    private Integer qty;
+    private Integer qty = 0;
 
     @Column(name = "FINISH_QTY")
     @ApiParam("已检数量")
-    private Integer finishQty;
+    private Integer finishQty = 0;
 
     @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
@@ -138,4 +139,8 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
     @ApiParam("质检单检测记录id")
     private Long qcOrderRecordId;
 
+    @Transient
+    @ApiParam("质检单集合")
+    private List<String> orderNoList;
+
 }

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

@@ -73,4 +73,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
     @Transient
     @ApiParam("物料名称")
     private String partName;
+
+    @Transient
+    @ApiParam("收货日期")
+    private String receiptDate;
 }

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

@@ -50,7 +50,11 @@ public class MesShiftGroup extends BaseBean implements Serializable {
     @ApiParam("班长")
     private String squadLeader;
 
-    @Transient
+    @Column(name = "USER_EMP_NO")
-    @ApiParam("班组数")
+    @ApiParam(value = "工号")
-    private String count;
+    private String userEmpNo;
+
+    @Column(name = "SHIFT_NUM")
+    @ApiParam("班组人数")
+    private String shiftNum;
 }

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

@@ -170,6 +170,10 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam("客户零件号")
     private String custPartNo;
 
+    @Transient
+    @ApiParam("配方项")
+    private String recipeItem;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -40,6 +40,9 @@ public class MesControlPlanModel {
     @ApiParam("是否启用")
     private Integer isEnable;
 
+    @ApiParam("是否删除")
+    private Integer isCutOut;
+
     @ApiParam("质量标准数组")
     private List<MesQualityStandardModel> standardList;
 

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

@@ -27,13 +27,13 @@ public class MgnBoardListModel {
      * 开班时间到当前时间按小时累计计划数量
      */
     @ApiParam("每小时计划产量")
-    private Double minPlanYield;
+    private Double minPlanYield;//
 
     /**
      * 开班时间到当前时间按小时累计实际数量
      */
     @ApiParam("每小时实际产量")
-    private Double minActualYield;
+    private Double minActualYield;//
 
     @ApiParam("计划完成率")
     private String planCompleteRate;

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

@@ -91,6 +91,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步序号")
     private Integer stepSeq;
 
+    @ApiParam("强制跳过工序")
+    private Boolean forceJumpProcess = false;
+
     @ApiParam("强制执行工步代码")
     private String forceSpecStepCode;
 

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

@@ -18,6 +18,8 @@ public class ProductSnModel implements Serializable {
 
     private static final long serialVersionUID = 7137684552464509466L;
 
+    @ApiParam("包装条码")
+    private String packageNo;
 
     @ApiParam("客户零件号")
     private String customerPartNo;
@@ -53,7 +55,13 @@ public class ProductSnModel implements Serializable {
     private String qcStatusName;
 
 
-    public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String workCellName, String createDatetime, String createUser, Integer qcStatus) {
+
+
+    public ProductSnModel(String packageNo,String customerPartNo, String serialNumber, String partNo,
+                          String qrCode, String workCenterName, String processName,
+                          String workCellName, String createDatetime,
+                          String createUser, Integer qcStatus) {
+        this.packageNo = packageNo;
         this.customerPartNo = customerPartNo;
         this.serialNumber = serialNumber;
         this.partNo = partNo;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelDetailRepository.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.IfPartCheckCustomerLabelDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/3/22 15:41
+ * @Modify:
+ **/
+@Repository
+public interface IfPartCheckCustomerLabelDetailRepository extends BaseRepository<IfPartCheckCustomerLabelDetail, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartCheckCustomerLabelRepository.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.IfPartCheckCustomerLabel;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/3/22 15:39
+ * @Modify:
+ **/
+@Repository
+public interface IfPartCheckCustomerLabelRepository extends BaseRepository<IfPartCheckCustomerLabel, Long> {
+}

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesKpDataRecord;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/3/25 2:00 PM
+ * @Modify:
+ */
+public interface MesKpDataRecordRepository extends BaseRepository<MesKpDataRecord, Long> {
+}

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

@@ -3,11 +3,13 @@ package cn.estsh.i3plus.pojo.mes.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.mes.bean.MesPackageTravel;
+import org.springframework.stereotype.Repository;
 
 /**
  * @Author: Wynne.Lu
  * @CreateDate: 2019/10/19 2:57 下午
  * @Description:
  **/
+@Repository
 public interface MesPackageTravelRepository extends BaseRepository<MesPackageTravel, Long> {
 }

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartCarModel;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/3/24 3:13 PM
+ * @Modify:
+ */
+public interface MesPartCarModelRepository extends BaseRepository<MesPartCarModel, Long> {
+}

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartSpecific;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/3/24 3:13 PM
+ * @Modify:
+ */
+public interface MesPartSpecificRepository extends BaseRepository<MesPartSpecific, Long> {
+}

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.mes.bean.MesPlc;
+import org.springframework.stereotype.Repository;
 
 /**
  * @Description:
@@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPlc;
  * @CreateDate:2019\10\9 0009 11:16
  * @Modify:
  **/
+@Repository
 public interface MesPlcRepository extends BaseRepository<MesPlc, Long> {
 }

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

@@ -1091,12 +1091,15 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesQcDetailReport(MesQcOrderDetail qcOrderDetail, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode);
-        if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
+//        if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
-            DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean);
+//              DdlPreparedPack.getStringEqualPack(mesQcOrder.getOrderNo(), "orderNo", packBean);
-        }
+//        }
         if (!StringUtils.isEmpty(qcOrderDetail.getCheckType())) {
             DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean);
         }
+        if (!CollectionUtils.isEmpty(qcOrderDetail.getOrderNoList())) {
+            DdlPreparedPack.getInPackList(qcOrderDetail.getOrderNoList(), "orderNo", packBean);
+        }
         return packBean;
     }
 
@@ -2692,6 +2695,7 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
         }
+        DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getNumEqualPack(mesProduceSn.getPrintStatus(), "printStatus", packBean);
         DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
 
@@ -3493,10 +3497,13 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(controlPlan.getCustCode(), "custCode", packBean);
         }
         if (!StringUtils.isEmpty(controlPlan.getVersion())) {
-            DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getVersion(), "version", packBean);
+            DdlPreparedPack.getNumEqualPack(controlPlan.getVersion(), "version", packBean);
         }
         if (!StringUtils.isEmpty(controlPlan.getAuditType())) {
-            DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getAuditType(), "auditType", packBean);
+            DdlPreparedPack.getNumEqualPack(controlPlan.getAuditType(), "auditType", packBean);
+        }
+        if (!StringUtils.isEmpty(controlPlan.getIsEnable())) {
+            DdlPreparedPack.getNumEqualPack(controlPlan.getIsEnable(), "isEnable", packBean);
         }
         return packBean;
     }
@@ -3791,4 +3798,21 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesPartCarModel(MesPartCarModel mesPartCarModel) {
+        DdlPackBean packBean = getAllBaseData(mesPartCarModel.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesPartCarModel.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPartCarModel.getVehicleCode(), "vehicleCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesPartCarModel.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMesPartSpecific(MesPartSpecific mesPartSpecific) {
+        DdlPackBean packBean = getAllBaseData(mesPartSpecific.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesPartSpecific.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesPartSpecific.getItemPartNo(), "itemPartNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPartSpecific.getSpecificSn(), "specificSn", packBean);
+        DdlPreparedPack.getNumEqualPack(mesPartSpecific.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }

modules/i3plus-pojo-model/pom.xml

@@ -29,10 +29,6 @@
             <artifactId>i3plus-pojo-report</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-form</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>i3plus.pojo</groupId>

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java

@@ -28,6 +28,7 @@ public class WmsJobParamModel implements Serializable {
     private Integer erpSyncFlag;//查询SHIPPING表的条件
     private String filterZoneNos;//过滤存储区
     private String zoneNos;//存储区
+    private String lineNo;//产线
 
 
     public int getMinuteDiffVal() {

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

@@ -9,8 +9,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 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;
@@ -18,6 +16,8 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 
 /**
@@ -212,6 +212,10 @@ public class WmsDocFgDetail extends BaseBean {
     @ApiParam(value = "接收时间")
     private String rcTime;
 
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam(value = "产品条码")
+    private String serialNumber;
+
 
 
 

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

@@ -8,8 +8,10 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 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;
@@ -114,43 +116,43 @@ public class WmsMoveDetails extends BaseBean {
     @Column(name = "SRC_WH_NO")
     @ApiParam("源仓库代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
-dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
-            searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code")
+            searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code")
     public String srcWhNo;
 
     @Column(name = "SRC_ZONE_NO")
     @ApiParam("源存储区代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
-dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
-            searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
+            searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
     public String srcZoneNo;
 
     @Column(name = "SRC_LOCATE_NO")
     @ApiParam("源库位代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
-dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
-            searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
+            searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     public String srcLocateNo;
 
     @Column(name = "DEST_WH_NO")
     @ApiParam("目标仓库代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
-dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
-            searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code")
+            searchColumnName = "code,name", listColumnName = "code,name", explicitColumnName = "code")
     public String destWhNo;
 
     @Column(name = "DEST_ZONE_NO")
     @ApiParam("目标存储区代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
-dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
-            searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
+            searchColumnName = "zoneNo,zoneName", listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
     public String destZoneNo;
 
     @Column(name = "DEST_LOCATE_NO")
     @ApiParam("目标库位代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
-dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
-            searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
+            searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     public String destLocateNo;
 
     /**
@@ -195,11 +197,22 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String bomVersion;
 
-    @ApiParam(value = "待出库数量", example = "0")
+
+    @ApiParam(value = "源库位余额")
+    @ColumnDefault("0")
+    @Column(name = "SRC_LOCATE_REST_QTY", columnDefinition = "decimal(18,8)")
+    private Double srcLocateRestQty = 0D;
+
+    @ApiParam(value = "目标库位余额")
+    @ColumnDefault("0")
+    @Column(name = "DEST_LOCATE_REST_QTY", columnDefinition = "decimal(18,8)")
+    private Double destLocateRestQty = 0D;
+
+    @ApiParam(value = "待出库数量")
     @Transient
     private Long waitingCounts;
 
-    @ApiParam(value = "已出库数量", example = "0")
+    @ApiParam(value = "已出库数量")
     @Transient
     private Long finishedCounts;
 
@@ -250,6 +263,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     public Integer lockVersion;
 
     @Transient
+    @ApiParam("历史数据")
+    private Boolean lookHistory;
+
+    @Transient
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
@@ -371,6 +388,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
     public Double getTransQty() {
         return this.transQty == null ? 0 : this.transQty.doubleValue();
     }
+
     public Double getHandledQtyVal() {
         return this.handledQty == null ? 0 : this.handledQty.doubleValue();
     }

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

@@ -94,6 +94,10 @@ public class WmsMoveMaster extends BaseBean {
     private String partNo;
 
     @Transient
+    @ApiParam("历史数据")
+    private Boolean lookHistory;
+
+    @Transient
     @ApiParam("明细状态")
     @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class)
     private String itemStatus;

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

@@ -209,6 +209,11 @@ public class WmsMoveSn extends BaseBean {
     private String ZoneNo;
 
     @Transient
+    @ApiParam("历史数据")
+    private Boolean lookHistory;
+
+
+    @Transient
     @ApiParam("交易类型名称")
     private String transTypeName;
 

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

@@ -259,6 +259,10 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("计划交货时间")
     private String planPlanDateTime;
 
+    @Transient
+    @ApiParam(value = "收货日期时间")
+    public String receiveDateTime;
+
 
 
 
@@ -305,12 +309,13 @@ public class WmsPOMaster extends BaseBean {
     }
 
     public WmsPOMaster(String orderNo, String reason, String planDate, String planTime,
-                       String receiveTime, String vendorNo, String vendorName, String organizeCode) {
+                       String receiveTime,String receiveDate, String vendorNo, String vendorName, String organizeCode) {
         this.orderNo = orderNo;
         this.reason = reason;
         this.planDate = planDate;
         this.planTime = planTime;
         this.receiveTime = receiveTime;
+        this.receiveDate= receiveDate;
         this.vendorNo = vendorNo;
         this.vendorName = vendorName;
         this.organizeCode = organizeCode;

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

@@ -4,14 +4,14 @@ 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.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 
 /**
@@ -59,4 +59,11 @@ public class WmsPrintingQueue extends BaseBean{
     @Column(name="VENDOR_NO")
     @ApiParam("供应商编码")
     private String vendorNo;
+
+    public WmsPrintingQueue() {
+    }
+
+    public WmsPrintingQueue(String printIdentification) {
+        this.printIdentification = printIdentification;
+    }
 }

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

@@ -104,6 +104,10 @@ public class WmsSerialSnTrans extends BaseBean {
     @ApiParam("操作类型")
     private List<Integer> transTypeLst;
 
+    public int getIsOkVal() {
+        return this.isOk == null ? 0 : this.isOk;
+    }
+
     public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) {
         this.organizeCode = wmsSerialSn.getOrganizeCode();
         this.batchNo = wmsSerialSn.getBatchNo();

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

@@ -4,8 +4,10 @@ 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;
@@ -179,7 +181,7 @@ public class WmsStockQuan extends BaseBean {
 
     @Transient
     @ApiParam(value = "差异数量MAP")
-    private Map<String, Map<String,Double>> differenceQtyMap;
+    private Map<String, Map<String, Double>> differenceQtyMap;
 
 
     public Integer getIsSnapshot() {
@@ -190,6 +192,11 @@ public class WmsStockQuan extends BaseBean {
         return areaNo;
     }
 
+    public Double getTotalQtyVal() {
+        return this.getQtyVal() + this.getFailQtyVal()+ this.getHoldQtyVal()+ this.getQcQtyVal()
+                + this.getRinQtyVal()+ this.getFreezeQtyVal()+ this.getConsignQtyVal()+ this.getScrapQtyVal();
+    }
+
     public Double getQtyVal() {
         return this.qty == null ? 0 : this.qty;
     }
@@ -295,6 +302,7 @@ public class WmsStockQuan extends BaseBean {
         this.prodCfgTypeName = prodCfgTypeName;
         this.scrapQty = scrapQty;
     }
+
     public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
         this.qty = qty;
         this.failQty = failQty;
@@ -378,6 +386,7 @@ public class WmsStockQuan extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.qty = qty;
     }
+
     public WmsStockQuan(String whNo, String zoneNo, String locateNo, String partNo, String partNameRdd) {
         this.whNo = whNo;
         this.zoneNo = zoneNo;

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

@@ -297,6 +297,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "jis料架号")
     private String queueGroupNo;
 
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam(value = "产品条码")
+    private String serialNumber;
+
     @Transient
     @ApiParam(value = "工厂名称")
     public String organizeName;

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

@@ -16,6 +16,8 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description :检测结果汇总表
@@ -97,9 +99,27 @@ public class WmsTestResultSummary extends BaseBean {
     private String sn;
 
     @Transient
+    @ApiParam("BH号集合")
+    private Map<String,Integer> bhTypes;
+
+    @Transient
     @ApiParam("库存条码二维码")
     private String serialSn;
 
+    @Transient
+    @ApiParam("返回给mes")
+    private List<WmsTestResultSummary> wmsForMes;
+
+    @Transient
+    @ApiParam("是否合格最大值")
+    private Integer maxQualified;
+
+
+    @Transient
+    @ApiParam("是否合格最小值")
+    private Integer minQualified;
+
+
     public WmsTestResultSummary(String organizeCode, String bhCode,
                                 String workCenterCode, String partNo,
                                 String partName, String flagNo, Integer isQualified,
@@ -135,6 +155,14 @@ public class WmsTestResultSummary extends BaseBean {
         this.bhType = bhType;
     }
 
+    public WmsTestResultSummary(Integer bhType, Integer maxQualified, Integer minQualified, String workCenterCode, String partNo) {
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.bhType = bhType;
+        this.maxQualified = maxQualified;
+        this.minQualified = minQualified;
+    }
+
     public WmsTestResultSummary() { }
 
 }

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

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.wms.bean.mesdata;
+
+
+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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description 发运物料校验基础数据（源于MES同步）
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2021/3/22 11:32
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "wms_send_part_check")
+@Api("发运物料校验数据")
+public class WmsSendPartCheck extends BaseBean {
+    private static final long serialVersionUID = 5370578735799188359L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "IS_CHECK")
+    @ApiParam("是否校验")
+    public Integer isCheck;
+
+}

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.wms.bean.mesdata;
+
+
+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.*;
+
+/**
+ * @Description 发运条码校验基础数据（源于MES同步）
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2021/3/22 11:32
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "wms_send_sn_check")
+@Api("发运条码绑定关系校验数据")
+public class WmsSendSnCheck extends BaseBean {
+    private static final long serialVersionUID = 2140873585281055846L;
+
+    @Column(name = "SN")
+    @ApiParam("产品条码")
+    public String sn;
+}

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

@@ -11,10 +11,10 @@ public class WmsInterfaceEnumUtil {
         MES2WMS(30, "MES2WMS", "MES --> WMS"),
         WMS2MES(40, "WMS2MES", "WMS --> MES"),
         SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"),
-        SWEB2SAP(50, "SWEB2SAP", "SWEB --> SAP"),
+        SWEB2SAP(60, "SWEB2SAP", "SWEB --> SAP"),
-        WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"),
+        WMS2SWEB(70, "WMS2SWEB", "WMS --> SWEB"),
-        SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"),
+        SAP2SWEB(80, "SAP2SWEB", "SAP --> SWEB"),
-        SAP2MES(60, "SAP2MES", "SAP --> WMS"),
+        SAP2MES(90, "SAP2MES", "SAP --> WMS"),
         ;
 
         private int value;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn;
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : Batch数据模型
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2021-04-05 14:53
+ * @Modify:
+ **/
+@Data
+@Api("Batch数据模型")
+public class WmsBatchModel {
+
+    @ApiParam("二维条码集合")
+    private List<WmsSerialSn> wmsSerialSns;
+
+    @ApiParam("条码集合")
+    private List<WmsStockSn> wmsStockSnList;
+
+    @ApiParam("Batch号")
+    private String bhCode;
+
+    @ApiParam("上一个熔深Batch号")
+    private String firstSnBatch;
+
+    @ApiParam("新事务单号")
+    private String moveNo;
+
+    @ApiParam("是否正常件")
+    private boolean flag;
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("操作人")
+    private String userName;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendPartCheckRepository.java

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository.mesdata;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+import cn.estsh.i3plus.pojo.wms.bean.mesdata.WmsSendPartCheck;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+/**
+* @Description : 库存条码dao层
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-17 15:53
+* @Modify:
+**/
+public interface WmsSendPartCheckRepository extends BaseRepository<WmsSendPartCheck, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendSnCheckRepository.java

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository.mesdata;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+import cn.estsh.i3plus.pojo.wms.bean.mesdata.WmsSendSnCheck;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+/**
+* @Description : 库存条码dao层
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-17 15:53
+* @Modify:
+**/
+public interface WmsSendSnCheckRepository extends BaseRepository<WmsSendSnCheck, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -3218,6 +3218,9 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result);
+        if (details.getIsRequire() != null) {
+            DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result);
+        }
         getStringBuilderPack(details, result);
         return result;
     }