From 17be4078be6199e4e98f777d52166b7cc18d97cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Mon, 29 Jul 2019 17:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java | 43 ++++++++++++++++++++++
 .../pojo/wms/repository/WmsFixRepository.java      | 16 ++++++++
 .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  | 19 ++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFixRepository.java

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java
new file mode 100644
index 0000000..ee108bf
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java
@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.wms.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.Index;
+import javax.persistence.Table;
+
+/**
+* @Description : WMS_设备信息
+* @Reference :
+* @author: amy.liu
+* @date: 2019/7/29 10:39
+* @Modify:
+*/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_FIX")
+@Api("WMS设备信息")
+public class WmsFix extends BaseBean{
+
+    @Column(name = "FIX_ID")
+    @ApiParam("设备编号")
+    public String fixId;
+
+    @Column(name = "FIX_MAC")
+    @ApiParam("设备mac地址")
+    public String fixMac;
+
+    @Column(name = "FIX_NAME")
+    @ApiParam("设备名称")
+    public String fixName;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFixRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFixRepository.java
new file mode 100644
index 0000000..57dca6a
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFixRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsFix;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description :  设备 对象持久层仓用方法控制
+* @Reference :
+* @author: amy.liu
+* @date: 2019/7/29 10:44
+* @Modify:
+*/
+@Repository
+public interface WmsFixRepository extends BaseRepository<WmsFix, Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 6f65d60..991f440 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -48,6 +48,25 @@ public class WmsHqlPack {
     }
 
     /**
+     *
+     * @param wmsFix
+     * @return
+     */
+    public static DdlPackBean packHqlWmsFix(WmsFix wmsFix){
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixId(), "fixId", result);
+        DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixMac(), "fixMac", result);
+        DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixName(), "fixName", result);
+
+        getStringBuilderPack(wmsFix, result);
+
+        return result;
+    }
+
+
+    /**
      * 单位换算 分页查询
      *
      * @return