Merge branch 'test'

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

@@ -191,19 +191,19 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_CODE_TYPE {
 
-        SERIAL_SN("10", "过程条码"),
-        PRODUCT_SN("20", "产品条码"),
-        PACK_SN("30", "包装条码");
+        SERIAL_SN(10, "过程条码"),
+        PRODUCT_SN(20, "产品条码"),
+        PACK_SN(30, "包装条码");
 
-        private String value;
+        private int value;
         private String description;
 
-        MES_CODE_TYPE(String value, String description) {
+        MES_CODE_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
 
-        public String getValue() {
+        public int getValue() {
             return value;
         }
 
@@ -211,7 +211,7 @@ public class MesPcnEnumUtil {
             return description;
         }
 
-        public static String valueOfDescription(String val) {
+        public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java

@@ -76,11 +76,11 @@ public class LacCommandStackStepTask extends BaseBean {
     /**
      * 不建议使用
      */
-    @Deprecated
-    @Column(name="TASK_INSTANCE_ID")
-    @ApiParam(value ="任务实例ID")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long taskInstanceId;
+//    @Deprecated
+//    @Column(name="TASK_INSTANCE_ID")
+//    @ApiParam(value ="任务实例ID")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long taskInstanceId;
 //
 //    @Column(name="STEP_NAME_RDD")
 //    @ApiParam(value ="步骤名称")
@@ -115,6 +115,13 @@ public class LacCommandStackStepTask extends BaseBean {
     @ApiParam(value ="适配任务记录")
     private LacLogTask logTask;
 
+    public Long getTaskInstanceId(){
+        if(lacSuitTask == null){
+            return logTask.getId();
+        }
+        return null;
+    }
+
     public LacCommandStackStepTask() {
     }
 

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java

@@ -126,10 +126,6 @@ public class LacSuitTask extends BaseBean {
     private LacSuitCase lacSuitCase;
 
     @Transient
-    @ApiParam(value ="任务实例id")
-    private Long taskInstanceId;
-
-    @Transient
     @ApiParam(value ="适配原始参数")
     private Object orginParam;
 

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java

@@ -34,8 +34,8 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacLogTask(LacLogTask bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"commandStackRecordId",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(), "commandStackRecordId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean);
 
         return ddlPackBean;
     }
@@ -43,7 +43,7 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacCommandStackTemplate(LacCommandStackTemplate bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(),"templateCode",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(), "templateCode", ddlPackBean);
 
         return ddlPackBean;
     }
@@ -51,7 +51,9 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacCommandStackStep(LacCommandStackStep bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTemplateId(), "templateId", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getStepName(), "stepName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getStepCode(), "stepCode", ddlPackBean);
 
         return ddlPackBean;
     }
@@ -60,23 +62,28 @@ public class LacHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getStepId(),"stepId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getTaskNameRdd(), "taskNameRdd", ddlPackBean);
 
         return ddlPackBean;
     }
 
     public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
-
-        DdlPreparedPack.getStringLikerPack(bean.getTaskName(),"taskName",ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(bean.getTaskCode(),"taskCode",ddlPackBean);
+        if (bean == null) {
+            return ddlPackBean;
+        }
+        DdlPreparedPack.getStringLikerPack(bean.getTaskName(), "taskName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getTaskCode(), "taskCode", ddlPackBean);
 
         return ddlPackBean;
     }
 
     public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean, List<Long> idList) {
-        DdlPackBean ddlPackBean = packHqlLacSuitTask(bean) ;
+        DdlPackBean ddlPackBean = packHqlLacSuitTask(bean);
 
-        DdlPreparedPack.getInPackList(idList,"id",ddlPackBean);
+        DdlPreparedPack.getInPackList(idList, "id", ddlPackBean);
 
         return ddlPackBean;
     }
@@ -90,15 +97,18 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean, List<Long> taskIdList) {
         DdlPackBean ddlPackBean = packHqlLacSuitTaskParamAdapter(bean);
 
-        DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean);
+        DdlPreparedPack.getInPackList(taskIdList, "taskId", ddlPackBean);
 
         return ddlPackBean;
     }
 
     public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
-        DdlPreparedPack.getNumEqualPack(bean.getParamType(),"paramType",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
+        if(bean == null){
+            return ddlPackBean;
+        }
+        DdlPreparedPack.getNumEqualPack(bean.getParamType(), "paramType", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean);
 
         return ddlPackBean;
     }
@@ -106,7 +116,7 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean, List<Long> taskIdList) {
         DdlPackBean ddlPackBean = packHqlLacSuitTaskParam(bean);
 
-        DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean);
+        DdlPreparedPack.getInPackList(taskIdList, "taskId", ddlPackBean);
 
         return ddlPackBean;
     }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java

@@ -63,4 +63,11 @@ public class LacCommandStackModel {
         return null;
     }
 
+    public Long getRecordId(){
+        if(recordId == null &&this.commandStackRecord !=null){
+            this.recordId = this.commandStackRecord.getId();
+        }
+        return recordId;
+    }
+
 }

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

@@ -46,6 +46,13 @@ public class SysMenu extends BaseBean {
     @ApiParam(value ="功能代码")
     private String menuCode;
 
+    /**
+     * 产品类型暂时不能填写, 产品以上线调整影响范围太大.
+     */
+    @Column(name="SOFT_TYPE")
+    @ApiParam(value ="产品类型", example = "0")
+    private Integer softTyp;
+
     @Column(name="MENU_TYPE")
     @ApiParam(value ="功能类型" , example ="-1" ,access = "枚举：1.模块，2.菜单，3.按钮")
     private Integer menuType;