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

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

@@ -1816,7 +1816,8 @@ public class CommonEnumUtil {
         SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
         SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
         SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
-        SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public");
+        SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"),
+        SOURCE_SAP_HANA(500, "SapHana", "SapHana","com.sap.db.jdbc.Driver",39015,null);
 
         private int value;
         private String code;
@@ -1908,6 +1909,13 @@ public class CommonEnumUtil {
             return tmp;
         }
 
+        public String getSchemaPattern(String schema) {
+            if(this.equals(SOURCE_SAP_HANA)){
+                return schema;
+            }
+            return defaultSchemaPattern;
+        }
+
         public String getJDBCUrl(String database,String host,Integer port){
             if(this.getValue() == SOURCE_MARIA_DB.getValue()){
                 return getJDBCUrlMySQL(database,host,port);
@@ -1917,6 +1925,8 @@ public class CommonEnumUtil {
                 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;
         }
@@ -1944,6 +1954,8 @@ public class CommonEnumUtil {
                     return SOURCE_POSTGRE_SQL;
                 }else if(databaseProductName.indexOf(":sqlserver:") != -1){
                     return SOURCE_SQL_SERVER;
+                }else if(databaseProductName.indexOf(":sap:") != -1){
+                    return SOURCE_SAP_HANA;
                 }
             }
             return null;
@@ -1965,6 +1977,10 @@ public class CommonEnumUtil {
             return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
         }
 
+        private String getJDBCUrlSapHana(String database,String host,Integer port){
+            return "jdbc:sap://" + host + ":" + port + "?reconnect=true";
+        }
+
         private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){
             StringBuffer sb = new StringBuffer();
             sb.append("jdbc:sqlserver://").append(host);

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

@@ -7859,4 +7859,84 @@ public class MesEnumUtil {
         }
     }
 
+
+
+    /**
+     * 物料 物料类型1
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_CATEGORY1 {
+        RAW_PART(10, "原材料"),
+        SEMI_FINISHED_PRODUCT(20, "半成品"),
+        FINISHED_PRODUCT(30, "成品");
+
+        private int value;
+        private String description;
+
+        PART_CATEGORY1(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 查询周期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUERY_GAP_TYPE {
+        MINUTE("MINUTE", "分钟"),
+        HOUR("HOUR", "小时"),
+        DAY("DAY", " 日"),
+        WEEK("WEEK", " 周"),
+        MONTH("MONTH", " 月");
+
+        private String value;
+        private String description;
+
+        QUERY_GAP_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -80,6 +80,10 @@ public class MesPcnSyncCfg extends BaseBean implements Serializable {
     @ApiParam(value = "同步的时候是否区分工厂")
     private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
+    @Column(name = "IGNORE_FIELDS")
+    @ApiParam(value = "同步的时候部分字段不同步")
+    private String ignoreFields;
+
     @Transient
     @ApiParam("同步方式")
     private String syncPatternName;

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

@@ -14,6 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description :
@@ -145,6 +146,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     private Integer noticeSign = 10;
 
     @Transient
+    @ApiParam("创建时间")
+    private String cdtTruncated;
+
+    @Transient
     @ApiParam("客户需求开始时间")
     private String custPointStartDate;
 

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

@@ -116,6 +116,9 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("特殊标识")
     private Integer specialFlag;
 
+    @ApiParam("箱条码")
+    private String packageNo;
+
     public QueueOrderModel() {
     }
 

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

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/10/19 15:02
+ * @desc
+ */
+@Data
+public class JisaJphReportModel {
+
+    private Double jphVal;
+
+    private Map<String, Long> detailsMap;
+
+}

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

@@ -3445,6 +3445,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(paintPolishingReportModel.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getPartNo(), "partNo", packBean);
         }
+        if (!StringUtils.isEmpty(paintPolishingReportModel.getWorkOrderNo())) {
+            DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getWorkOrderNo(), "workOrderNo", packBean);
+        }
         if (!StringUtils.isEmpty(paintPolishingReportModel.getModifyStartDate()) || !StringUtils.isEmpty(paintPolishingReportModel.getModifyEndDate())) {
             DdlPreparedPack.timeBuilder(paintPolishingReportModel.getModifyStartDate(), paintPolishingReportModel.getModifyEndDate(),
                     "modifyDatetime", packBean, true);

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

@@ -98,4 +98,8 @@ public class WmsDocSoDetails extends BaseBean {
     @ApiParam("业务类型")
     @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
     public Integer busiType;
+
+    @Transient
+    @ApiParam(value = "客户发往地代码")
+    private String custDeliveryCode;
 }

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

@@ -221,10 +221,10 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double proportion;
 
-    @Column(name = "STD_CHECK_TIME")
+    @Column(name = "STD_CHECK_TIME", columnDefinition = "decimal(10,2)")
     @ApiParam(value = "标准质检时间")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Integer stdCheckTime;
+    private Double stdCheckTime;
 
     @Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
     @ApiParam(value = "是否贵重")