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/sqlpack/AndonHqlPack.java

@@ -173,6 +173,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getAndonOrderNo(), "andonOrderNo", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result);
         DdlPreparedPack.getInPackArray(obj, "statusCode", result);
 
         getStringBuilderPack(andonManageQueue, result);

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.pcn.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPLCConfigure;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface MesPLCConfigureRepository extends BaseRepository<MesPLCConfigureRepository, Long> {
+public interface MesPLCConfigureRepository extends BaseRepository<MesPLCConfigure, Long> {
 }

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

@@ -303,6 +303,7 @@ public class MesHqlPack {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdRouteCfg, organizeCode);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
         packBean.setOrderByStr(mesProdRouteCfg.orderBy());
         return packBean;
     }
@@ -374,6 +375,9 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(step.getStepName())){
             DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean);
         }
+        if (StringUtils.isNotEmpty(step.getStepType())){
+            DdlPreparedPack.getStringLikerPack(step.getStepType(), "stepType", packBean);
+        }
 
         return packBean;
     }

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

@@ -21,8 +21,6 @@ import java.util.List;
 public class MesRouteModel implements Serializable {
     @ApiParam("流程代码")
     public String routeCode;
-    @ApiParam("工厂代码")
-    public String organizeCode;
     @ApiParam("GOJS位置")
     public String position;
     @ApiParam("流程明细Model集合")

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

@@ -25,6 +25,6 @@ public class MesRouteProcessModel {
     public MesRouteProcess mesRouteProcess;
     @ApiParam("流程工步参数配置表(根据Seq分组)")
     public Map<String, List<MesRouteProcessStep>> mesRouteProcessStepMap;
-    @ApiParam("流程工步参数配置表(根据Seq分组)")
+    @ApiParam("产品流程参数配置表(根据Seq分组)")
     public Map<String, List<MesProdRouteOptParam>> mesProdRouteOptParamMap;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.model.test;
+
+import cn.estsh.i3plus.pojo.platform.bean.TestTransUser;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.aspectj.weaver.ast.Test;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2019-05-19 18:15
+ * @Modify:
+ **/
+@Getter
+@Setter
+@ToString
+public class TestConstructModel {
+
+    private long id;
+
+    private TestTransUser user;
+
+    private List<TestTransUser> userList;
+}

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

@@ -26,7 +26,6 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-//@Table(name="SYS_MENU",indexes = {@Index(name="索引名称",columnList = "列名1,列名2")})
 @Table(name="SYS_MENU",indexes = {
         @Index(name="index_sys_menu_parent_id",columnList = "PARENT_ID"),
 })
@@ -46,7 +45,7 @@ public class SysMenu extends BaseBean {
     private String menuCode;
 
     @Column(name="MENU_TYPE")
-    @ApiParam(value ="功能类型（枚举：1.模块，2.菜单，3.按钮）" , example ="-1")
+    @ApiParam(value ="功能类型" , example ="-1" ,access = "枚举：1.模块，2.菜单，3.按钮")
     private Integer menuType;
 
     // 根节点-1
@@ -88,7 +87,7 @@ public class SysMenu extends BaseBean {
     private String menuDescription;
 
     @Column(name="MENU_STATUS")
-    @ApiParam(value ="功能状态（1.正常，2.禁用）" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1")
+    @ApiParam(value ="功能状态" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1")
     private Integer menuStatus;
 
     @Transient