From b375983304f257d2ea1cb6efa6564ea7cda99217 Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Fri, 23 Aug 2019 16:54:56 +0800
Subject: [PATCH] =?UTF-8?q?mes=E6=9D=A1=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=A7=84=E5=88=99CURD=E5=8F=8Amesbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/bean/MesNumberRule.java  |  2 +-
 .../mes/repository/MesNumberRuleRepository.java    | 17 ++++++++++++++
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 26 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java
index ab0ae70..edbbdeb 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/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("编码规则")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java
new file mode 100644
index 0000000..5ee49bb
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java
@@ -0,0 +1,17 @@
+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:
+ **/
+@Repository
+public interface MesNumberRuleRepository extends BaseRepository<MesNumberRule, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 648be8b..b509989 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -1077,4 +1077,30 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+
+    /**
+     * Mes条码生成规则
+     * @param numberRule
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesNumberRule(MesNumberRule numberRule, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(numberRule, organizeCode);
+        if (StringUtils.isNotEmpty(numberRule.getRuleCode())) {
+            DdlPreparedPack.getStringLikerPack(numberRule.getRuleCode(), "ruleCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(numberRule.getNumberRule())) {
+            DdlPreparedPack.getStringLikerPack(numberRule.getNumberRule(), "numberRule", packBean);
+        }
+        if (StringUtils.isNotEmpty(numberRule.getPrefix())) {
+            DdlPreparedPack.getNumEqualPack(numberRule.getPrefix(), "prefix", packBean);
+        }
+        if (null != numberRule.getIsCycle()) {
+            DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean);
+        }
+
+        packBean.setOrderByStr(numberRule.orderBy());
+        return packBean;
+    }
 }