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

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

@@ -897,5 +897,39 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 条码生成业务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMPANY_TYPE {
+        PREFIX("prefix", "前缀"),
+        PART_NO("partNo", "物料号"),
+        CUST_PART_NO("custPartNo", "客户物料号"),
+        CUST_CODE("custCode", "客户代码"),
+        PROD_LOCATION("prodLocation", "产地"),
+        YEAR("year", "年"),
+        MOTH("month", "月"),
+        DAY("day", "日"),
+        HOUR("hour", "小时"),
+        MINUTE("minute", "分钟"),
+        SECOND("second", "秒"),
+        SERIAL("serialNo", "序列号");
+
+        private String value;
+        private String description;
+
+        COMPANY_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 
 }

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

@@ -1139,8 +1139,7 @@ public class WmsEnumUtil {
         CREATE(10, "创建"),
         BE_HANDLE(20, "待处理"),
         FINISH(30, "已处理"),
-        HANDLE_ERROR(40, "处理出错"),
-        TEST(50, "调试");
+        HANDLE_ERROR(40, "处理出错");
 
         private int value;
         private String description;

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

@@ -38,7 +38,7 @@ public class MesNumberRule extends BaseBean {
 
     @Column(name = "PREFIX")
     @ApiParam("前缀")
-    private Integer prefix;
+    private String prefix;
 
     @Column(name = "NUMBER_RULE")
     @ApiParam("编码规则")

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

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: 打印条码工步， 打印信息模板
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-08-27-13:24
+ * @Modify:
+ **/
+@Data
+@Api("过程条码打印信息模板")
+public class StepPrintSnModel extends MesProduceSn {
+    @ApiParam("打印描述")
+    private String printDesc;
+}

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

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 /**
  * @Author: Wynne.Lu
  * @CreateDate: 2019/8/19 7:00 PM
- * @Description:
+ * @Description: mes文件下载的model -> Esop
  **/
 
 @Data

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

@@ -0,0 +1,70 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule;
+import cn.estsh.i3plus.pojo.mes.bean.MesNumberSerialno;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/23 11:42 AM
+ * @Description:
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("生成条码模型")
+public class GenSerialNoModel extends BaseBean {
+
+    @ApiParam("规则代码")
+    private String ruleCode;
+
+    @ApiParam("规则描述")
+    private String ruleDesc;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("客户物料号")
+    private String custPartNo;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("产地")
+    private String prodLocation;
+
+    @ApiParam("前缀")
+    private Integer prefix;
+
+    @ApiParam("编码规则")
+    private String numberRule;
+
+    @ApiParam("序号长度")
+    private Integer serialnoLength;
+
+    @ApiParam("增量")
+    private Integer serialnoIncrement;
+
+    @ApiParam("最大值后循环")
+    private Integer isCycle;
+
+    @ApiParam("当前编号前缀")
+    private String currentNumberPrefix;
+
+    @ApiParam("当前序号")
+    private Integer currentSerialno;
+
+    @ApiParam("当前编号")
+    private String currentNumber;
+
+
+}

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

@@ -16,7 +16,4 @@ import java.util.List;
 @Repository
 public interface MesMethodRepository extends BaseRepository<MesMethod, Long> {
 
-    List<MesMethod> findByMethodCodeAndIsValidAndIsDeleted(String methodCode, Integer isValid, Integer isDeleted);
-
-    List<MesMethod> findByOrganizeCodeAndIsDeleted(String organizeCode, int value);
 }

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

@@ -1,16 +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.MesNumberRule;
-import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import org.springframework.stereotype.Repository;
 
 /**
- * @Description :条码生成规则
- * @Reference :
- * @Author : wangjie
- * @CreateDate : 2019-08-23
- * @Modify:
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/23 1:22 PM
+ * @Description:
  **/
 @Repository
 public interface MesNumberRuleRepository extends BaseRepository<MesNumberRule, Long> {

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesNumberSerialno;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/23 1:23 PM
+ * @Description:
+ **/
+
+@Repository
+public interface MesNumberSerialnoRepository extends BaseRepository<MesNumberSerialno, Long> {
+}

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

@@ -234,6 +234,14 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getAllBaseDataByNormalPro(String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
+        return packBean;
+    }
+
     /**
      * MES区域信息查询条件封装
      *
@@ -445,6 +453,19 @@ public class MesHqlPack {
      * @param mesESOP
      * @return
      */
+    public static DdlPackBean getMesESOPExcludeById(MesESOP mesESOP, String org) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(org);
+        DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesESOP.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesESOP.getProcessCode(), "processCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesESOP.getStepCode(), "stepCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesESOP.getStepSeq(), "stepSeq", packBean);
+        DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(mesESOP.getId(), "id", packBean);
+        return packBean;
+    }
+
     public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode);
         if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())) {
@@ -834,9 +855,19 @@ public class MesHqlPack {
     /**
      * MES 产品配置信息查询条件封装
      *
-     * @param prodCfg
+     * @param
      * @return
      */
+
+    public static DdlPackBean getMesProdCfgExcludeById(MesProdRouteCfg mesProdRouteCfg, String org) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(org);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(mesProdRouteCfg.getId(), "id", packBean);
+        return packBean;
+    }
+
     public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode);
         if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())) {

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 库位表
@@ -96,6 +97,11 @@ public class WmsLocate extends BaseBean {
     @ApiParam(value = "零件数", example = "-1")
     private Double partQty;
 
+    // 导入用
+    @ApiParam(value = "工厂")
+    @Transient
+    private String factory;
+
     public Integer getMaxPackageQty() {
         return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
     }