From 307f07e7ed00349077761012d15b4af5a804efc1 Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Tue, 12 Mar 2019 18:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E5=BE=AE=E6=9C=8D=E6=9D=A1=E7=A0=81=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/platform/bean/SysBarcodeRule.java  | 52 ++++++++++++++++++++++
 .../i3plus/pojo/platform/bean/SysOrderNoRule.java  |  2 +-
 .../repository/SysBarcodeRuleRepository.java       | 14 ++++++
 .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java  | 30 +++++++++++++
 4 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java
 create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysBarcodeRuleRepository.java

diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java
new file mode 100644
index 0000000..61c82cc
--- /dev/null
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java
@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+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 : yunhao
+ * @CreateDate : 2019-03-12 14:45
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_BARCODE_RULE")
+@Api(value="条码规则",description = "条码规则")
+public class SysBarcodeRule extends BaseBean {
+
+    @Column(name = "NAME")
+    @ApiParam(value = "规则名称")
+    private String name;
+
+    @Column(name = "BARCODE_RULE_CODE")
+    @ApiParam(value = "规则代码")
+    private String barcodeRuleCode;
+
+    @Column(name = "BARCODE_RULE")
+    @ApiParam(value = "条码规则")
+    private String barcodeRule;
+
+    @Column(name = "BARCODE_SEPARATOR")
+    @ApiParam(value = "条码分隔符")
+    private String barcodeSeparator;
+
+    @Column(name="BARCODE_RULE_DESCRIPTION")
+    @ApiParam(value ="条码规则描述")
+    private String barcodeRuleDescription;
+
+}
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java
index 89e9d29..258e35d 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java
@@ -41,7 +41,7 @@ public class SysOrderNoRule extends BaseBean {
     @ApiParam(value = "规则代码")
     private String orderNoRuleCode;
 
-    @Column(name = "numberRule")
+    @Column(name = "ORDER_NO_RULE")
     @ApiParam(value = "单号规则")
     private String orderNoRule;
 
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysBarcodeRuleRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysBarcodeRuleRepository.java
new file mode 100644
index 0000000..d1fd285
--- /dev/null
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysBarcodeRuleRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule;
+
+/**
+ * @Description : 条码规则
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-03-12 16:02
+ * @Modify:
+ **/
+public interface SysBarcodeRuleRepository extends BaseRepository<SysBarcodeRule, Long> {
+}
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
index 98afcba..dd792df 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
@@ -635,4 +635,34 @@ public class CoreHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 条码规则代码是否存在
+     * @param sysBarcodeRule
+     * @return
+     */
+    public static String packHqlSysBarcodeRuleCode(SysBarcodeRule sysBarcodeRule){
+        StringBuffer result =  new StringBuffer();
+
+        // and
+        HqlPack.getStringEqualPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result);
+        // not
+        HqlPack.getNumNOEqualPack(sysBarcodeRule.getId(),"id",result);
+
+        return result.toString();
+    }
+
+    /**
+     * 条码规则复杂查询
+     * @param sysBarcodeRule
+     * @return
+     */
+    public static String packHqlSysBarcodeRule(SysBarcodeRule sysBarcodeRule){
+        StringBuffer result =  new StringBuffer();
+
+        HqlPack.getStringLikerPack(sysBarcodeRule.getName(),"name",result);
+        HqlPack.getStringLikerPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result);
+
+        return result.toString();
+    }
 }
\ No newline at end of file