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/BlockSoftSwitchEnumUtil.java

@@ -135,7 +135,8 @@ public class BlockSoftSwitchEnumUtil {
         CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"),
 
         /* FTP */
-        CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器");
+        CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"),
+        SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器");
 
         private int value;
         private String description;

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

@@ -4560,4 +4560,42 @@ public class MesEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 工位BOM表中的匹配类型
+     * 10.
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STATION_BOM_MATCH_RULE {
+
+        BARCODE_RULE_MATCHING(10, "条码规则匹配"),
+        PROCESS_BARCODE_MATCHING(20, "过程条码匹配"),
+        BAR_CODE_MATCHING(30, "箱条码匹配");
+
+        private int value;
+        private String description;
+
+        STATION_BOM_MATCH_RULE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            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;
+        }
+    }
 }

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

@@ -2473,7 +2473,7 @@ public class MesPcnEnumUtil {
         IMAGE("image", "图片"),
         BUTTON("button", "按钮"),
         TABLES("tables", "多个表格"),
-        DATA("data", "表格");
+        FORM("form", "文本按钮");
 
         private String value;
         private String description;
@@ -2953,7 +2953,7 @@ public class MesPcnEnumUtil {
 
         BARCODE_RULE_MATCHING(10, "条码规则匹配"),
         PROCESS_BARCODE_MATCHING(20, "过程条码匹配"),
-        BAR_CODE_MATCHING(20, "条码匹配");
+        BAR_CODE_MATCHING(30, "箱条码匹配");
 
         private int value;
         private String description;
@@ -3199,4 +3199,39 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 客户发运JIT生产队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SHIPPING_ACTUAL_STATUS {
+        CREATE(10, "创建"),
+        CANCEL(20, "已发运");
+
+        private int value;
+        private String description;
+
+        SHIPPING_ACTUAL_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            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;
+        }
+    }
 }

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

@@ -0,0 +1,91 @@
+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;
+import java.util.Date;
+
+/**
+ * @Description :JIT发运数据同步
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-03-27
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "if_queue_shipping")
+@Api("JIT发运数据同步")
+public class IfQueueShipping extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -8961182851667690154L;
+    @Column(name = "JIT_NO")
+    @ApiParam("JIT队列编号")
+    private String jitNo;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
+
+    @Column(name = "CUST_FLAG_NO")
+    @ApiParam("客户标识号")
+    private String custFlagNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("操作人")
+    private String supplierCode;
+
+    @Column(name = "ACTION_DATE_TIME")
+    @ApiParam("操作时间")
+    private Date actionDateTime;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private Integer ifCode;
+
+}

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

@@ -33,6 +33,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 655875369308810110L;
 
+
     @Column(name = "JIS_ACTUAL_NO")
     @ApiParam("队列编号")
     private String jisActualNo;

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -47,6 +48,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @ApiParam("产品位置代码")
     private String produceCtgyCode;
 
+    @Transient
+    @ApiParam("产品位置")
+    private String prodCfgName;
+
     @Column(name = "PART_NAME")
     @ApiParam("产品名称")
     private String partName;
@@ -62,4 +67,12 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @Column(name = "GROUP_SEQ")
     @ApiParam("分组序号")
     private String groupSeq;
+
+    @Column(name = "status")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "seq")
+    @ApiParam("主序编号")
+    private String seq;
 }

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

@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.model;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch;
 import cn.estsh.i3plus.pojo.mes.annotation.Json4Es;
-import com.sun.tools.javac.util.List;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -11,7 +10,6 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Map;
 
 /**
  * @Description:

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : JIT发运队列列表Model
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-05-22 16:34
+ * @Modify:
+ **/
+@Data
+@Api("JIT发运队列列表Model")
+public class QueueShippingModel implements Serializable {
+    private Long id;
+
+    @ApiParam("显示颜色")
+    private String color;
+
+    @ApiParam("队列编号")
+    private String jisActualNo;
+
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @ApiParam("产品位置")
+    private String prodCfgName;
+
+    @ApiParam("起始vin")
+    private String vin;
+
+    @ApiParam("结束vin")
+    private String endVin;
+
+    @ApiParam("料架号")
+    private String queueGroupNo;
+
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfQueueShipping;
+
+/**
+ * @Description :IF_JIT发运数据
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-03-06 10:57 上午
+ * @Modify:
+ **/
+public interface IfQueueShippingRepository extends BaseRepository<IfQueueShipping, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java

@@ -54,6 +54,11 @@ public class SysLabelTemplate extends BaseBean {
     @ApiParam(value ="模板内容")
     private String templateContent;
 
+    @Lob
+    @Column(name="OTHER_TEMPLATE_CONTENT")
+    @ApiParam(value ="其他模板内容")
+    private String otherTemplateContent;
+
     // 参数拼接，多参数都好分隔，后台在做处理
     @Transient
     @ApiParam(value ="模板参数拼接")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java

@@ -37,6 +37,9 @@ public class SysLocaleResource  extends BaseBean {
     private Integer resourceType;
 
     @Transient
+    private String resourceTypes;
+
+    @Transient
     private String resourceTypeTxt;
 
     public String getResourceTypeTxt(){
@@ -56,6 +59,7 @@ public class SysLocaleResource  extends BaseBean {
     @ApiParam(value = "语言名称",example = "浏览器语言名称")
     private String languageNameRdd;
 
+    @Lob
     @Column(name="resource_key")
     @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档")
     @AnnoOutputColumn
@@ -82,4 +86,5 @@ public class SysLocaleResource  extends BaseBean {
     @ApiParam(value = "是否系统参数",example = "2")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     private Integer isSystem;
+
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -4,32 +4,10 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule;
-import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
-import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
-import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
-import cn.estsh.i3plus.pojo.platform.bean.SysFile;
-import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
-import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam;
-import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
-import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
-import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
-import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
-import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
-import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
-import cn.estsh.i3plus.pojo.platform.bean.SysPosition;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole;
-import cn.estsh.i3plus.pojo.platform.bean.SysRole;
-import cn.estsh.i3plus.pojo.platform.bean.SysTask;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
-import cn.estsh.i3plus.pojo.platform.bean.SysTool;
-import cn.estsh.i3plus.pojo.platform.bean.SysToolType;
-import cn.estsh.i3plus.pojo.platform.bean.SysUser;
-import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
+import cn.estsh.i3plus.pojo.platform.bean.*;
+import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.lang3.StringUtils;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -42,6 +20,10 @@ import java.util.stream.Collectors;
  **/
 public class CoreHqlPack {
 
+    private CoreHqlPack() {
+        throw new IllegalStateException("Utility class");
+    }
+
     /**
      * In 参数封装
      * @param columnName
@@ -81,6 +63,11 @@ public class CoreHqlPack {
 
         if(resource != null){
             DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result);
+            // 是否多类型查询
+            if(StringUtils.isNotBlank(resource.getResourceTypes())){
+                DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result);
+            }
+
             DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result);
             DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result);
             DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result);
@@ -630,7 +617,7 @@ public class CoreHqlPack {
         HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
         HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
 
-        if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){
+        if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()){
             HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result);
         }
 
@@ -653,7 +640,7 @@ public class CoreHqlPack {
         DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
         DdlPreparedPack.getInPackList(idList,"id",result);
 
-        if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){
+        if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty() ){
             DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result);
         }
 
@@ -677,7 +664,7 @@ public class CoreHqlPack {
 
         // And
         HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
-        if(idList != null && idList.size() > 0){
+        if(idList != null && !idList.isEmpty()){
             HqlPack.getInPack(StringUtils.join(idList, ","), "id", result);
         }
 
@@ -977,7 +964,7 @@ public class CoreHqlPack {
      */
     public static DdlPackBean packHqlSysOrganize(List<SysRefUserDepartment> sysRefUserDepartments){
         DdlPackBean packBean = DdlPackBean.getDdlPackBean();
-        DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean);
+        DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()),"id",packBean);
 
         return packBean;
     }

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

@@ -62,6 +62,10 @@ public class WmsAreaOwner extends BaseBean {
     @ApiParam(value = "是否预分配人员")
     private Integer isPreAssign;
 
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次编码")
+    private String shiftNo;
+
     @Transient
     @ApiParam(value = "供应商名称")
     private String vendorName;
@@ -81,4 +85,8 @@ public class WmsAreaOwner extends BaseBean {
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编号")
     private String custNo;
+
+    @Transient
+    @ApiParam(value = "分配次数")
+    private Integer count;
 }