merge dev 还原pom

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

@@ -6448,4 +6448,76 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 客户JIT预装队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIT_PLAN_STATUS {
+        CREATE(10, "创建"),
+        RELEASED(20, "已释放"),
+        ERROR(999, "异常");
+
+        private Integer value;
+        private String description;
+
+        QUEUE_JIT_PLAN_STATUS(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 客户JIT预装队列 工单类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIT_PLAN_WORK_ORDER_TYPE {
+        SPARE_PART_PRODUCTION(10, "备件生产"),
+        REPRODUCTION_RMS(20, "重新生产-报功"),
+        REPRODUCTION_NOT_RMS(30, "重新生产-不报功");
+
+        private Integer value;
+        private String description;
+
+        QUEUE_JIT_PLAN_WORK_ORDER_TYPE(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer 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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -2407,6 +2407,16 @@ public class MesPcnEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
 
@@ -4266,8 +4276,8 @@ public class MesPcnEnumUtil {
     public enum BAD_HANDLE_TYPE {
         BACK_SPRAY(10, "BACK_SPRAY", "返喷"),
         SCRAPPED(20, "SCRAPPED", "报废"),
-        POLISH(30, "POLISH", "抛光"),
-        DETERMINED(40, "DETERMINED", "待定");
+        POLISHING(30, "POLISHING", "抛光"),
+        DETERMIND(40, "DETERMIND", "待定");
 
         private int value;
         private String code;

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

@@ -126,10 +126,10 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 
 	@Column(name = "JIT_SEQ")
 	@ApiParam("jit排序号")
-	private String jitSeq;
+	private Double jitSeq;
 
 	@Column(name = "JIT_TYPE_FLAG")
-	@ApiParam("jit类型标识")
+	@ApiParam("JIT类型标识")
 	private String jitTypeFlag;
 
 	@Column(name = "CUST_POINT_DATE")
@@ -138,7 +138,7 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 
 	@Column(name = "CUST_PLANT_CODE")
 	@ApiParam("客户工厂代码")
-	private String custPlantDate;
+	private String custPlantCode;
 
 	@Column(name = "DOCK_NO")
 	@ApiParam("道口")

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

@@ -45,4 +45,8 @@ public class MesCustomerPart extends BaseBean implements Serializable {
     @Column(name = "CUSTOMER_PART_NAME")
     @ApiParam("客户零件描述")
     private String customerPartName;
+
+    @Column(name = "CUSTOMER_CFG_CODE")
+    @ApiParam("客戶配置代碼")
+    private String customerCfgCode;
 }

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

@@ -123,6 +123,11 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("包装标签模板")
     private String packageLabelTemplate;
 
+    // 二维码
+    @Column(name = "QR_CODE")
+    @ApiParam("包装二维码")
+    private String qrCode;
+
     public MesPackage() {
     }
 

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

@@ -12,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Lob;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -78,19 +79,18 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
 
     @Column(name = "JIT_SEQ")
     @ApiParam("JIT排序号")
-    private String jitSeq;
+    private Double jitSeq;
 
     @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
-    @Lob
     @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;
 
     @Column(name = "SUPPLIER_CODE")
-    @ApiParam("供应商代码")
+    @ApiParam("供应商编号")
     private String supplierCode;
 
     @Column(name = "SUPPLIER_NAME")
@@ -98,11 +98,22 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
     private String supplierName;
 
     @Column(name = "FILE_NAME")
-    @ApiParam("文件名称")
+    @ApiParam("解析文件名")
     private String fileName;
 
     @Column(name = "FILE_URL")
-    @ApiParam("文件url")
+    @ApiParam("解析文件路径")
     private String fileUrl;
 
+    @Column(name = "WORK_ORDER_TYPE")
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @Transient
+    @ApiParam("计划上线开始时间")
+    private String planStartDate;
+
+    @Transient
+    @ApiParam("计划上线结束时间")
+    private String planEndDate;
 }

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

@@ -44,7 +44,7 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
     private String partNo;
 
     @Column(name = "PART_NAME")
-    @ApiParam("产品名称")
+    @ApiParam("物料名称")
     private String partName;
 
     @Column(name = "PRODUCE_CTGY_CODE")
@@ -58,5 +58,4 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
     @Column(name = "FORMULA_CONTENT")
     @ApiParam("配方内容")
     private String formulaContent;
-
 }

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

@@ -2,19 +2,16 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
-import com.alibaba.fastjson.JSONObject;
 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 org.springframework.util.StringUtils;
 
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description:
@@ -159,7 +156,7 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @Lob
     @Column(name = "EXTEND")
     @ApiParam("扩展数据")
-    private String extend;
+    public String extend;
 
     @Column(name = "RESERVED1")
     @ApiParam("预留字段1")
@@ -273,10 +270,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     public String comButtonCode;
 
     @Transient
-    @ApiParam(value = "扩展数据MAP")
-    public Map<String, Object> extendMap;
-
-    @Transient
     @ApiParam("工单源序号")
     private Double srcSeq;
 
@@ -320,15 +313,4 @@ public class MesWorkOrder extends BaseBean implements Serializable {
         return this.approvalStatus == null ? 0 : this.approvalStatus;
     }
 
-    public Map<String, Object> getExtendMap() {
-        try {
-            if (!StringUtils.isEmpty(this.extend)) {
-                return JSONObject.parseObject(this.extend, Map.class);
-            } else {
-                return null;
-            }
-        } catch (Exception e) {
-            return null;
-        }
-    }
 }

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

@@ -55,4 +55,7 @@ public class ButtonComponentReqModel {
     @ApiParam("用户信息")
     private String userInfo;
 
+    @ApiParam("json数据")
+    private String data;
+
 }

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("注塑生产控制MODEL")
+public class InjectionProductionControlModel {
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("当前合格数量")
+    private String standardQtyCur;
+
+    @ApiParam("当前合格数量")
+    private String completeQty;
+
+    @ApiParam("总不合格数量")
+    private String scrapQty;
+
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @ApiParam("数量")
+    private String qty;
+
+    @ApiParam("包装时间")
+    private String createDatetime;
+
+    @ApiParam("箱条码状态")
+    private String printStatusName;
+
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.Transient;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description : 生产工单扩展
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2020-03-30 13:42
+ * @Modify:
+ **/
+@Data
+@Api(value="生产工单扩展",description = "生产工单扩展")
+public class MesWorkOrderExtendModel extends MesWorkOrder {
+
+    @Transient
+    @ApiParam(value = "扩展数据MAP")
+    public Map<String, Object> extendMap;
+
+    public Map<String, Object> getExtendMap() {
+        try {
+            if (!StringUtils.isEmpty(super.extend)) {
+                return JSONObject.parseObject(super.extend, Map.class);
+            } else {
+                return new HashMap<>();
+            }
+        } catch (Exception e) {
+            return new HashMap<>();
+        }
+    }
+
+}

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

@@ -1,12 +1,12 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
 import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.util.List;
 
 /**
@@ -39,22 +39,18 @@ public class PaintCheckModel {
     @ApiParam("界面编号")
     private String windowNo;
 
-    @ApiParam("缺陷类型")
-    private String defectType;
-
-    @ApiParam("缺陷描述")
-    private String defectDesc;
-
     @ApiParam("缺陷标识值")
     private String defectFlagValue;
 
     @ApiParam("不良品处理类型")
     private Integer defectActionType;
 
-    @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
+    @ApiParam("缺陷列表")
+    private List<MesDefect> defectList;
+
     @ApiParam("界面组件参数数据")
     List<MesWindowModuleParam> windowModuleParamList;
 }

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

@@ -29,7 +29,7 @@ public class PaintWorkOrderSnModel extends BaseBean {
     private String partNo;
 
     @ApiParam("物料名称")
-    private String partNameRdd;
+    private String partName;
 
     @ApiParam("颜色代码")
     private String colorCode;

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

@@ -156,6 +156,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("状态机代码")
     private String smCode;
 
+    @ApiParam("区域代码")
+    private String areaCode;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -58,4 +59,7 @@ public class StationResultBean<T> implements Serializable {
 
     @ApiParam("特殊展示数据")
     private Object specialDisplayData;
+
+    @ApiParam("工位参数")
+    private Map<String, String> wcpcMap = new HashMap<>();
 }

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

@@ -3130,4 +3130,72 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 客户JIT预装队列
+     * @param queueJitPlan
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesQueueJitPlan(MesQueueJitPlan queueJitPlan, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlan, organizeCode);
+        if (!StringUtils.isEmpty(queueJitPlan.getJisPlanNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlan.getJisPlanNo(), "jisPlanNo", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitPlan.getCustPlantCode())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustPlantCode(), "custPlantCode", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitPlan.getCustFlagNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustFlagNo(), "custFlagNo", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitPlan.getVinCode())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlan.getVinCode(), "vinCode", packBean);
+        }
+        if (queueJitPlan.getStatus() != null) {
+            DdlPreparedPack.getNumEqualPack(queueJitPlan.getStatus(), "status", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        return packBean;
+    }
+
+    /**
+     * 客户JIT预装队列明细
+     * @param queueJitPlanDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesQueueJitPlanDetail(MesQueueJitPlanDetail queueJitPlanDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanDetail, organizeCode);
+        if (!StringUtils.isEmpty(queueJitPlanDetail.getJisPlanNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getJisPlanNo(), "jisPlanNo", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitPlanDetail.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getPartNo(), "partNo", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 客户JIT预装队列BOM
+     * @param queueJitPlanBom
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesQueueJitPlanBom(MesQueueJitPlanBom queueJitPlanBom, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanBom, organizeCode);
+        if (!StringUtils.isEmpty(queueJitPlanBom.getJisPlanNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getJisPlanNo(), "jisPlanNo", packBean);
+        }
+        if (!StringUtils.isEmpty(queueJitPlanBom.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getPartNo(), "partNo", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -26,6 +26,7 @@ public class CoreHqlPack {
 
     /**
      * In 参数封装
+     *
      * @param columnName
      * @return
      */
@@ -40,6 +41,7 @@ public class CoreHqlPack {
 
     /**
      * In 参数封装
+     *
      * @param columnName
      * @return
      */
@@ -56,6 +58,7 @@ public class CoreHqlPack {
 
     /**
      * In 参数封装
+     *
      * @param columnName
      * @return
      */
@@ -69,6 +72,7 @@ public class CoreHqlPack {
 
     /**
      * In 参数封装
+     *
      * @param columnName
      * @return
      */
@@ -83,6 +87,7 @@ public class CoreHqlPack {
 
     /**
      * 资源查询
+     *
      * @param resource
      * @return
      */
@@ -108,6 +113,7 @@ public class CoreHqlPack {
 
     /**
      * 语言
+     *
      * @param localeLanguage
      * @return
      */
@@ -130,6 +136,7 @@ public class CoreHqlPack {
 
     /**
      * 岗位复杂查询
+     *
      * @param position
      * @return
      */
@@ -153,6 +160,7 @@ public class CoreHqlPack {
 
     /**
      * 岗位复杂查询
+     *
      * @param position
      * @return
      */
@@ -168,6 +176,7 @@ public class CoreHqlPack {
 
     /**
      * 岗位复杂查询
+     *
      * @param bean
      * @return
      */
@@ -183,6 +192,7 @@ public class CoreHqlPack {
 
     /**
      * 组织复杂查询
+     *
      * @param organize
      * @return
      */
@@ -235,6 +245,7 @@ public class CoreHqlPack {
 
     /**
      * 部门复杂查询
+     *
      * @param department
      * @return
      */
@@ -297,6 +308,7 @@ public class CoreHqlPack {
 
     /**
      * 系统角色复杂查询
+     *
      * @param role
      * @return
      */
@@ -316,6 +328,7 @@ public class CoreHqlPack {
 
     /**
      * 系统角色复杂查询
+     *
      * @param role
      * @return
      */
@@ -323,6 +336,20 @@ public class CoreHqlPack {
         return packDdlBeanSysRole(role, null);
     }
 
+    /**
+     * 唯一校验
+     *
+     * @param role
+     * @return
+     */
+    public static DdlPackBean packDdlSysRoleCheckOnly(SysRole role) {
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(role.getName(), "name", result);
+        DdlPreparedPack.getNumEqualPack(role.getId(), "id", result);
+        return result;
+    }
+
     public static DdlPackBean packDdlBeanSysRole(SysRole role, List<Long> idList) {
         DdlPackBean result = DdlPackBean.getDdlPackBean(role);
 
@@ -337,6 +364,7 @@ public class CoreHqlPack {
 
     /**
      * 系统参数复杂查询
+     *
      * @param config
      * @return
      */
@@ -357,6 +385,7 @@ public class CoreHqlPack {
 
     /**
      * 字典信息复杂查询
+     *
      * @param dictionary
      * @return
      */
@@ -385,6 +414,7 @@ public class CoreHqlPack {
 
     /**
      * 硬件类型复杂查询
+     *
      * @param toolType
      * @return
      */
@@ -402,6 +432,7 @@ public class CoreHqlPack {
 
     /**
      * 硬件复杂查询
+     *
      * @param tool
      * @return
      */
@@ -425,6 +456,7 @@ public class CoreHqlPack {
 
     /**
      * 消息复杂查询
+     *
      * @param message
      * @return
      */
@@ -452,6 +484,7 @@ public class CoreHqlPack {
 
     /**
      * 文件资源复杂查询
+     *
      * @param file
      * @return
      */
@@ -471,6 +504,7 @@ public class CoreHqlPack {
 
     /**
      * 任务周期复杂查询
+     *
      * @param sysTaskCycle
      * @return
      */
@@ -489,6 +523,7 @@ public class CoreHqlPack {
 
     /**
      * 定时任务复杂查询
+     *
      * @param sysTaskPlan
      * @return
      */
@@ -512,6 +547,7 @@ public class CoreHqlPack {
 
     /**
      * 账号复杂查询
+     *
      * @param user
      * @return
      */
@@ -565,6 +601,7 @@ public class CoreHqlPack {
 
     /**
      * 账号复杂查询
+     *
      * @param user
      * @return
      */
@@ -599,6 +636,7 @@ public class CoreHqlPack {
 
     /**
      * 查询字典代码是否重复
+     *
      * @param dictionary
      * @return
      */
@@ -620,6 +658,7 @@ public class CoreHqlPack {
 
     /**
      * 查询字典值是否重复
+     *
      * @param dictionary
      * @return
      */
@@ -641,6 +680,7 @@ public class CoreHqlPack {
 
     /**
      * 用户信息 复杂查询拼接
+     *
      * @param userInfo
      * @return
      */
@@ -695,6 +735,7 @@ public class CoreHqlPack {
 
     /**
      * 用户信息 复杂查询拼接
+     *
      * @param userInfo
      * @return
      */
@@ -719,6 +760,7 @@ public class CoreHqlPack {
 
     /**
      * 查询语言代码是否重复
+     *
      * @param localeLanguage
      * @return
      */
@@ -736,6 +778,7 @@ public class CoreHqlPack {
 
     /**
      * 检查系统资源是否重复
+     *
      * @param localeResource
      * @return
      */
@@ -755,6 +798,7 @@ public class CoreHqlPack {
 
     /**
      * 查询规则代码是否重复
+     *
      * @param orderNoRule
      * @return
      */
@@ -774,6 +818,7 @@ public class CoreHqlPack {
 
     /**
      * 单号规则复杂查询，分页，排序
+     *
      * @param orderNoRule
      * @return
      */
@@ -798,6 +843,7 @@ public class CoreHqlPack {
 
     /**
      * 用户消息关系表负责查询
+     *
      * @param sysRefUserMessage
      * @return
      */
@@ -820,6 +866,7 @@ public class CoreHqlPack {
 
     /**
      * 任务复杂查询
+     *
      * @param sysTask
      * @return
      */
@@ -848,6 +895,7 @@ public class CoreHqlPack {
 
     /**
      * 大小区间比较
+     *
      * @param columnName
      * @param min
      * @param max
@@ -865,6 +913,7 @@ public class CoreHqlPack {
 
     /**
      * 字典信息查询id集合中是否存在默认数据
+     *
      * @param ids
      * @return
      */
@@ -880,6 +929,7 @@ public class CoreHqlPack {
 
     /**
      * 条码规则代码是否存在
+     *
      * @param sysBarcodeRule
      * @return
      */
@@ -896,6 +946,7 @@ public class CoreHqlPack {
 
     /**
      * 条码规则复杂查询
+     *
      * @param sysBarcodeRule
      * @return
      */
@@ -910,6 +961,7 @@ public class CoreHqlPack {
 
     /**
      * 打印模板复杂查询
+     *
      * @param sysLabelTemplate
      * @return
      */
@@ -946,6 +998,7 @@ public class CoreHqlPack {
 
     /**
      * 打印模板参数复杂查询
+     *
      * @param sysLabelTemplateParam
      * @return
      */
@@ -965,9 +1018,9 @@ public class CoreHqlPack {
     }
 
 
-
     /**
      * 文件代码是否存在
+     *
      * @param sysFile 查询条件
      * @return DdlPackBean
      */
@@ -1008,6 +1061,7 @@ public class CoreHqlPack {
 
     /**
      * 查询当前用户所有组织数据
+     *
      * @param sysRefUserDepartments
      * @return
      */
@@ -1020,6 +1074,7 @@ public class CoreHqlPack {
 
     /**
      * 按条件查询字典
+     *
      * @param sysDictionary
      * @return
      */
@@ -1039,6 +1094,7 @@ public class CoreHqlPack {
 
     /**
      * 按条件查询字典
+     *
      * @param bean
      * @return
      */

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-PROD-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./