Merge remote-tracking branch 'origin/master'

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

@@ -3,6 +3,9 @@ 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 org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -15,7 +18,10 @@ import javax.persistence.Table;
  * @CreateDate : 2018-09-04 15:58
  * @Modify:
  **/
+@Data
 @Entity
+@DynamicInsert
+@DynamicUpdate
 @Table(name="factory_store")
 @Api("工厂仓库")
 public class FactoryStore extends BaseBean {
@@ -27,40 +33,4 @@ public class FactoryStore extends BaseBean {
     @Column(name="store_name")
     @ApiParam("仓库名称")
     public String storeName;
-
-    public FactoryStore() {
-    }
-
-    public FactoryStore(String storeCode, String storeName) {
-        this.storeCode = storeCode;
-        this.storeName = storeName;
-    }
-
-    public String getStoreCode() {
-        return storeCode;
-    }
-
-    public void setStoreCode(String storeCode) {
-        this.storeCode = storeCode;
-    }
-
-    public String getStoreName() {
-        return storeName;
-    }
-
-    public void setStoreName(String storeName) {
-        this.storeName = storeName;
-    }
-
-    @Override
-    public String toString() {
-        return "FactoryStore{" +
-                "storeCode='" + storeCode + '\'' +
-                ", storeName='" + storeName + '\'' +
-                ", id=" + id +
-                ", isValid=" + isValid +
-                ", createDate='" + createDatetime + '\'' +
-                ", modifyDate='" + modifyDatetime + '\'' +
-                '}';
-    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.wms.sqlpack;
+
+import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.platform.bean.Department;
+import cn.estsh.i3plus.pojo.platform.bean.Position;
+import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
+import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
+import cn.estsh.i3plus.pojo.wms.bean.FactoryStore;
+
+/**
+ * @Description : 仓库管理对象封装
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-10-31 10:45
+ * @Modify:
+ **/
+public class WmsHqlPack {
+
+    /**
+     * 工厂仓库模糊分页查询
+     * @param factoryStore
+     * @return
+     */
+    public static String packHqlFactoryStore(FactoryStore factoryStore) {
+        StringBuffer result = new StringBuffer();
+
+        // 部门名称
+        HqlPack.getStringLikerPack(factoryStore.getStoreCode(),"storeCode", result);
+        // 部门代码
+        HqlPack.getStringLikerPack(factoryStore.getStoreName(),"storeName", result);
+
+        return result.toString();
+    }
+}