Merge branch 'dev' into test

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java

@@ -130,14 +130,26 @@ public class AndonManageRecord extends BaseBean {
     @ApiParam(value = "呼叫人")
     private String callUser;
 
+    @Transient
+    @ApiParam(value = "呼叫人名字")
+    private String callUserName;
+
     @Column(name = "CONFIRM_USER")
     @ApiParam(value = "响应人")
     private String confirmUser;
 
+    @Transient
+    @ApiParam(value = "响应人名字")
+    private String confirmUserName;
+
     @Column(name = "RESET_USER")
     @ApiParam(value = "解决人")
     private String resetUser;
 
+    @Transient
+    @ApiParam(value = "解决人名字")
+    private String resetUserName;
+
     @Column(name = "IS_SHIFT_CALL")
     @ApiParam(value = "是否转呼", example = "1")
     private Integer isShiftCall;

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

@@ -33,17 +33,21 @@ public class MesPartScheduleBom extends BaseBean {
 
     @Column(name="ITEM_PART_NO")
     @ApiParam("关联物料号")
-    private Integer itemPartNo;
+    private String itemPartNo;
 
     @Column(name="ITEM_QTY")
     @ApiParam("用量")
-    private String itemQty;
+    private Double itemQty;
 
     @Column(name="SCHEDULE_TYPE")
     @ApiParam("排程类型")
-    private Double scheduleType;
+    private Integer scheduleType;
+
+    public double getItemQtyVal() {
+        return this.itemQty == null ? 0.0d : this.itemQty;
+    }
 
     public double getScheduletTypeVal() {
-        return this.scheduleType == null ? 0.0d : this.scheduleType;
+        return this.scheduleType == null ? 0 : this.scheduleType;
     }
 }

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

@@ -1,7 +1,5 @@
-package cn.estsh.i3plus.pojo.model.mes;
+package cn.estsh.i3plus.pojo.mes.model;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
-import cn.estsh.i3plus.pojo.model.wms.WmsActionGroupDetailsModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,9 +1,8 @@
-package cn.estsh.i3plus.pojo.model.mes;
+package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteOptParam;
 import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
 import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessStep;
-import cn.estsh.i3plus.pojo.wms.bean.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import io.swagger.annotations.ApiParam;
+
+import javax.persistence.Transient;
+import java.util.List;
+
+public class SysOrganizeModel {
+
+    @Transient
+    @ApiParam(value ="父节点")
+    private Long parentId;
+
+    @Transient
+    @ApiParam(value ="名称")
+    private String name;
+
+    @Transient
+    @ApiParam(value ="子集列表")
+    private List<MesArea> childTreeList;
+
+    public List<MesArea> getChildTreeList() {
+        return childTreeList;
+    }
+
+    public void setChildTreeList(List<MesArea> childTreeList) {
+        this.childTreeList = childTreeList;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -632,4 +632,86 @@ public class MesHqlPack {
 
         return packBean;
     }
+
+    /**
+     * MES 物料分类信息查询条件封装
+     * @param partCategory
+     * @return
+     */
+    public static DdlPackBean getMesPartCategory(MesPartCategory partCategory, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(partCategory, organizeCode);
+        if (StringUtils.isNotEmpty(partCategory.getCategoryCode())){
+            DdlPreparedPack.getStringEqualPack(partCategory.getCategoryCode(), "categoryCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(partCategory.getCategoryName())){
+            DdlPreparedPack.getStringLikerPack(partCategory.getCategoryName(), "categoryName", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 包装规格信息查询条件封装
+     * @param packSpec
+     * @return
+     */
+    public static DdlPackBean getMesPackSpec(MesPackSpec packSpec, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(packSpec, organizeCode);
+        if (StringUtils.isNotEmpty(packSpec.getSpecCode())){
+            DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "specCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(packSpec.getSpecName())){
+            DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 产品类型信息查询条件封装
+     * @param produceCategory
+     * @return
+     */
+    public static DdlPackBean getMesProduceCategory(MesProduceCategory produceCategory, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(produceCategory, organizeCode);
+        if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())){
+            DdlPreparedPack.getStringEqualPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())){
+            DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryName(), "produceCategoryName", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 关键件条码规则信息查询条件封装
+     * @param kpsnRule
+     * @return
+     */
+    public static DdlPackBean getMesKpsnRule(MesKpsnRule kpsnRule, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(kpsnRule, organizeCode);
+        if (StringUtils.isNotEmpty(kpsnRule.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(kpsnRule.getPartNo(), "partNo", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 产品排程清单信息查询条件封装
+     * @param partScheduleBom
+     * @return
+     */
+    public static DdlPackBean getMesPartScheduleBom(MesPartScheduleBom partScheduleBom, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(partScheduleBom, organizeCode);
+        if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(partScheduleBom.getPartNo(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())){
+            DdlPreparedPack.getStringLikerPack(partScheduleBom.getItemPartNo(), "itemPartNo", packBean);
+        }
+
+        return packBean;
+    }
 }

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

@@ -1,23 +0,0 @@
-package cn.estsh.i3plus.pojo.model.mes;
-
-import cn.estsh.i3plus.pojo.mes.bean.MesArea;
-import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
-import io.swagger.annotations.ApiParam;
-
-import javax.persistence.Transient;
-import java.util.List;
-
-public class SysOrganizeModel extends SysOrganize{
-
-    @Transient
-    @ApiParam(value ="子集列表")
-    private List<MesArea> childTreeList;
-
-    public List<MesArea> getChildTreeList() {
-        return childTreeList;
-    }
-
-    public void setChildTreeList(List<MesArea> childTreeList) {
-        this.childTreeList = childTreeList;
-    }
-}