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

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

@@ -0,0 +1,43 @@
+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;
+
+/**
+ * @Description : MES_容器
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-03-27 14:29
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CONTAINER")
+@Api("MES_容器类型")
+public class MesContainer extends BaseBean {
+    private static final long serialVersionUID = -3843389042411645111L;
+
+    @Column(name = "CT_NO")
+    @ApiParam(value = "容器编号")
+    private String ctNo;
+
+    @Column(name = "CT_CODE")
+    @ApiParam(value = "容器类型代码")
+    private String ctCode;
+
+    @Column(name = "USE_STATUS")
+    @ApiParam(value = "使用状态")
+    private String useStatus;
+}

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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;
+
+/**
+ * @Description : MES_容器类型
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-03-27 14:24
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CONTAINER_TYPE")
+@Api("MES_容器类型")
+public class MesContainerType extends BaseBean {
+
+    private static final long serialVersionUID = 2831600566482383573L;
+
+    @Column(name = "CT_CODE")
+    @ApiParam(value = "容器类型代码")
+    private String ctCode;
+
+    @Column(name = "CT_NAME")
+    @ApiParam(value = "容器类型名称")
+    private String ctName;
+
+    @Column(name = "USE_LIMIT")
+    @ApiParam(value = "使用期限")
+    private Integer useLimit;
+
+    @Column(name = "IS_RECYCLE")
+    @ApiParam(value = "是否回收")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isRecycle;
+
+    @Column(name = "LIMIT_UOM")
+    @ApiParam(value = "期限单位")
+    private String limitUom;
+}

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

@@ -0,0 +1,45 @@
+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;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/20 0020 - 16:21
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WINDOW_MODULE")
+@Api("MES_界面组件配置")
+public class MesWindowModule extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -634938009999201410L;
+
+    @Column(name = "WINDOW_NO")
+    @ApiParam("菜单编号")
+    private String windowNo;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("按钮组件代码")
+    private String moduleCode;
+
+    @Column(name = "WINDOW_MODULE_BACK")
+    @ApiParam("回调界面方法")
+    private String windowModuleBack;
+
+}

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

@@ -0,0 +1,47 @@
+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;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/20 0020 - 16:25
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WINDOW_MODULE_PARAM")
+@Api("MES_界面组件参数配置")
+public class MesWindowModuleParam extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5834883080240684524L;
+
+    @Column(name = "WINDOW_NO")
+    @ApiParam("界面编号")
+    private String windowNo;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_VALUE")
+    @ApiParam("参数值")
+    private String paramValue;
+}

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 工位扫描中，按钮组件之间传输的model
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/23 0023 - 13:14
+ */
+@Data
+@Api("按钮组件传输请求Model")
+public class ButtonComponentReqModel {
+
+    @ApiParam("扫描信息")
+    private String scanInfo;
+
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("工厂")
+    private String organizeCode;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("确认码")
+    private String confirmNo;
+
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+    @ApiParam("界面编号")
+    private String windowNo;
+
+    @ApiParam("父界面编号")
+    private String parentWindowNo;
+
+    @ApiParam("客户标识号")
+    private String custFlagNo;
+
+}

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/25 0025 - 19:41
+ */
+@Data
+@Api("按钮组件传输响应Model")
+public class ButtonComponentResultModel {
+
+    @ApiParam("成功信号")
+    private boolean isSuccess;
+
+    @ApiParam("提示信息")
+    private String msg;
+
+    @ApiParam("动态按钮组")
+    private List<ButtonModel> buttonModels;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("产品条码信息")
+    private MesProduceSn produceSn;
+
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+}

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

@@ -0,0 +1,28 @@
+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;
+
+/**
+ * @Description : 按钮model
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/25 0025 - 5:02
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("按钮组件")
+public class ButtonModel {
+    @ApiParam("组件代码")
+    private String moduleCode;
+
+    @ApiParam("组件名称")
+    private String moduleName;
+
+    @ApiParam("界面回调方法")
+    private String windowModuleBack;
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/20 0020 - 16:37
+ */
+@Repository
+public interface MesWindowModuleParamRepository extends BaseRepository<MesWindowModuleParam,Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWindowModule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zcg
+ * @Date : 2020/3/20 0020 - 16:36
+ */
+@Repository
+public interface MesWindowModuleRepository extends BaseRepository<MesWindowModule,Long> {
+}

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

@@ -2237,4 +2237,47 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 界面组件配置
+     * @param windowModule
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesWindowModule(MesWindowModule windowModule, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(windowModule, organizeCode);
+        if(!StringUtils.isEmpty(windowModule.getWindowNo())){
+            DdlPreparedPack.getStringLikerPack(windowModule.getWindowNo(), "windowNo", packBean);
+        }
+        if(!StringUtils.isEmpty(windowModule.getModuleCode())){
+            DdlPreparedPack.getStringLikerPack(windowModule.getModuleCode(), "moduleCode", packBean);
+        }
+        if(!StringUtils.isEmpty(windowModule.getWindowModuleBack())){
+            DdlPreparedPack.getStringLikerPack(windowModule.getWindowModuleBack(), "windowModuleBack", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 界面组件参数配置
+     * @param windowModuleParam
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesWindowModuleParam(MesWindowModuleParam windowModuleParam, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(windowModuleParam, organizeCode);
+        if(!StringUtils.isEmpty(windowModuleParam.getWindowNo())){
+            DdlPreparedPack.getStringLikerPack(windowModuleParam.getWindowNo(), "windowNo", packBean);
+        }
+        if(!StringUtils.isEmpty(windowModuleParam.getModuleCode())){
+            DdlPreparedPack.getStringLikerPack(windowModuleParam.getModuleCode(), "moduleCode", packBean);
+        }
+        if(!StringUtils.isEmpty(windowModuleParam.getParamCode())){
+            DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamCode(), "paramCode", packBean);
+        }
+        if(!StringUtils.isEmpty(windowModuleParam.getParamValue())){
+            DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamValue(), "paramValue", packBean);
+        }
+        return packBean;
+    }
 }

pom.xml

@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-${profileActive}-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>