Merge remote-tracking branch 'origin/dev' into dev

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

@@ -13,6 +13,44 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
 
+
+    /**
+     * MesIf  交互方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IF_CONNECT_TYPE {
+
+        DB("10", "DB"),
+        WEBSERVICE("20", "webservice "),
+        RESTFUL("30", "restful");
+
+        private String value;
+        private String description;
+
+        IF_CONNECT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     /**
      * Mes  工厂初始化数据
      */

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

@@ -2072,6 +2072,46 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 工位程序交互时的数据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STATION_DATA_TYPE {
+        TABLE("table", "表格"),
+        TEXT("text", "正常文本"),
+        EXP_TEXT("exp_text", "异常文本"),
+        FILE("file", "定制内容文件"),
+        IMAGE("image", "图片"),
+        BUTTON("button", "按钮");
+
+        private String value;
+        private String description;
+
+        STATION_DATA_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (val.equals(values()[i].value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ONLINE_SEND_TYPE {
@@ -2141,6 +2181,44 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 包装层级 MES_PACKAGE
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_PACKLEVEL {
+
+        FIRST(1, "第一层"),
+        SECOND(2, "第二层"),
+        THIRD(3, "第三层"),
+        FOURTH(4, "第四层");
+
+        private int value;
+        private String description;
+
+        PACKAGE_PACKLEVEL(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;
+        }
+    }
+
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRODUCT_PATTERN_PARAMS {

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

@@ -4105,4 +4105,42 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 编组管理操作类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_OPERATE_TYPE {
+        PACKAGE_ADD("PACKAGE_ADD", "新增"),
+        PACKAGE_ADDITIONAL("PACKAGE_ADDITIONAL", "追加"),
+        PACKAGE_DELETE("PACKAGE_DELETE", "删除"),
+        PACKAGE_CLEAR("PACKAGE_CLEAR", "清空");
+
+        private String value;
+        private String description;
+
+        PACKAGE_OPERATE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String getDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (val.equals(values()[i].value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -48,7 +48,7 @@ public class MesPackage extends BaseBean {
     private Double packSpecQty;
 
     @Column(name = "UNIT")
-    @ApiParam("包装规格数量")
+    @ApiParam("danwei")
     private String unit;
 
     @Column(name = "LOT_NO")
@@ -63,10 +63,6 @@ public class MesPackage extends BaseBean {
     @ApiParam("是否封箱")
     private Integer isSealed;
 
-    @Transient
-    @ApiParam("封箱状态")
-    private String sealStatus;
-
     @Column(name = "PRINT_STATUS")
     @ApiParam("打印状态10：未打印 20：已打印")
     private Integer printStatus;
@@ -87,6 +83,14 @@ public class MesPackage extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Transient
+    @ApiParam("封箱状态")
+    private String sealStatus;
+
+    @Transient
+    @ApiParam("客户代码")
+    private String custCode;
+
     public MesPackage() {
     }
 

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

@@ -43,6 +43,10 @@ public class MesProdPack extends BaseBean {
     @ApiParam("产品标签模板")
     private String prodLabelTemplate;
 
+    @Column(name = "PACK_LABEL_TEMPLATE")
+    @ApiParam("包装标签模板")
+    private String packLabelTemplate;
+
     @Column(name = "PACK_LABEL_TEMPLATE2")
     @ApiParam("包装标签模板2")
     private String packLabelTemplate2;

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

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/9/23 8:06 PM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("产品包装model")
+public class ProdPackageModel {
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("单位")
+    private String unit;
+
+    @ApiParam("工单数量")
+    private Double workOrderQty;
+
+    @ApiParam("完成数量")
+    private Double completeQty;
+
+    @ApiParam("包装规格数量")
+    private Double packSpecQty;
+
+    @ApiParam("包装规格")
+    private String packSpec;
+
+    @ApiParam("包装集合")
+    private List<MesPackage> packageList;
+
+    @ApiParam("工单集合")
+    private List<MesWorkOrder> workOrderList;
+
+}

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

@@ -0,0 +1,38 @@
+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:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\13 11:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_ACTION_IF")
+@Api("动作接口配置")
+public class MesActionIf extends BaseBean {
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+}

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

@@ -0,0 +1,46 @@
+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:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\13 11:43
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_IF")
+@Api("接口清单")
+public class MesIf extends BaseBean {
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+
+    @Column(name = "IF_NAME")
+    @ApiParam("接口名称")
+    private String ifName;
+
+    @Column(name = "IF_CONNECT_TYPE")
+    @ApiParam("交互方式")
+    private String ifConnectType;
+
+    @Column(name = "IF_CLASS")
+    @ApiParam("接口实现类")
+    private String ifClass;
+}

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

@@ -0,0 +1,46 @@
+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:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\13 11:40
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_KEY_ACTION")
+@Api("关键动作")
+public class MesKeyAction extends BaseBean {
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "ACTION_NAME")
+    @ApiParam("动作名称")
+    private String actionName;
+
+    @Column(name = "ACTION_DESC")
+    @ApiParam("动作描述")
+    private String actionDesc;
+
+    @Column(name = "ACTION_CLASS")
+    @ApiParam("动作关联类")
+    private String actionClass;
+}

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

@@ -63,10 +63,6 @@ public class MesPackage extends BaseBean {
     @ApiParam("是否封箱")
     private Integer isSealed;
 
-    @Transient
-    @ApiParam("封箱状态")
-    private String sealStatus;
-
     @Column(name = "PRINT_STATUS")
     @ApiParam("打印状态10：未打印 20：已打印")
     private Integer printStatus;
@@ -87,4 +83,12 @@ public class MesPackage extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Transient
+    @ApiParam("封箱状态")
+    private String sealStatus;
+
+    @Transient
+    @ApiParam("客户代码")
+    private String custCode;
+
 }

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

@@ -43,14 +43,14 @@ public class MesProdPack extends BaseBean {
     @ApiParam("产品标签模板")
     private String prodLabelTemplate;
 
-    @Column(name = "PACK_LABEL_TEMPLATE2")
-    @ApiParam("包装标签模板2")
-    private String packLabelTemplate2;
-
     @Column(name = "PACK_LABEL_TEMPLATE")
     @ApiParam("包装标签模板")
     private String packLabelTemplate;
 
+    @Column(name = "PACK_LABEL_TEMPLATE2")
+    @ApiParam("包装标签模板2")
+    private String packLabelTemplate2;
+
     @Column(name = "PACK_LABEL_TEMPLATE3")
     @ApiParam("包装标签模板3")
     private String packLabelTemplate3;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionIfRepository.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.MesActionIf;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\13 11:53
+ * @Modify:
+ **/
+public interface MesActionIfRepository extends BaseRepository<MesActionIf, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesIfRepository.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.MesIf;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\13 11:51
+ * @Modify:
+ **/
+public interface MesIfRepository extends BaseRepository<MesIf, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyActionRepository.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.MesKeyAction;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\13 11:50
+ * @Modify:
+ **/
+public interface MesKeyActionRepository extends BaseRepository<MesKeyAction, Long> {
+}

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

@@ -973,9 +973,6 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(packSpec.getSpecName())) {
             DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean);
         }
-//        if (!StringUtils.isEmpty(packSpec.getSpecCode())) {
-//            DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "parentSpec", packBean);
-//        }
 
         return packBean;
     }
@@ -1178,8 +1175,12 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode);
-        DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
-        DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
+        if (!StringUtils.isEmpty(mesPcnTask.getTaskCode())) {
+            DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPcnTask.getTaskName())) {
+            DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
+        }
         packBean.setOrderByStr(mesPcnTask.orderBy());
         return packBean;
     }
@@ -1670,7 +1671,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(mesProdPack.getPartNo(), "partNo", packBean);
         }
         if (!StringUtils.isEmpty(mesProdPack.getCustomerCode())) {
-            DdlPreparedPack.getStringEqualPack(mesProdPack.getCustomerCode(), "customerCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesProdPack.getCustomerCode(), "customerCode", packBean);
         }
         if (!StringUtils.isEmpty(mesProdPack.getPackSpec())) {
             DdlPreparedPack.getStringLikerPack(mesProdPack.getPackSpec(), "packSpec", packBean);
@@ -1746,4 +1747,84 @@ public class MesHqlPack {
                 "createDatetime", packBean, true);
         return packBean;
     }
+
+    /**
+     * 模板配置
+     * @param mesLabelTemplate
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesLabelTemplate(MesLabelTemplate mesLabelTemplate, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesLabelTemplate, organizeCode);
+        if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateCode())) {
+            DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) {
+            DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "codeType", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 关键动作
+     * @param mesKeyAction
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesKeyAction(MesKeyAction mesKeyAction, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesKeyAction, organizeCode);
+        if (!StringUtils.isEmpty(mesKeyAction.getActionCode())) {
+            DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionCode(), "actionCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesKeyAction.getActionName())) {
+            DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionName(), "actionName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesKeyAction.getActionDesc())) {
+            DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionDesc(), "actionDesc", packBean);
+        }
+        if (!StringUtils.isEmpty(mesKeyAction.getActionClass())) {
+            DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionClass(), "actionClass", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 动作接口配置
+     * @param mesActionIf
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesActionIf(MesActionIf mesActionIf, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesActionIf, organizeCode);
+        if (!StringUtils.isEmpty(mesActionIf.getActionCode())) {
+            DdlPreparedPack.getStringLikerPack(mesActionIf.getActionCode(), "actionCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesActionIf.getIfCode())) {
+            DdlPreparedPack.getStringLikerPack(mesActionIf.getIfCode(), "ifCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 接口清单
+     * @param mesIf
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesIf(MesIf mesIf, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesIf, organizeCode);
+        if (!StringUtils.isEmpty(mesIf.getIfCode())) {
+            DdlPreparedPack.getStringLikerPack(mesIf.getIfCode(), "ifCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesIf.getIfName())) {
+            DdlPreparedPack.getStringLikerPack(mesIf.getIfName(), "ifName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesIf.getIfConnectType())) {
+            DdlPreparedPack.getStringLikerPack(mesIf.getIfConnectType(), "ifConnectType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesIf.getIfClass())) {
+            DdlPreparedPack.getStringLikerPack(mesIf.getIfClass(), "ifClass", packBean);
+        }
+        return packBean;
+    }
 }