From 433ac603fc3f2e9f7523b3b02305c9737931b886 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 1 Nov 2018 13:41:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/CustomerSendTo.java | 52 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/FactoryStore.java | 2 +- .../i3plus/pojo/wms/bean/RefOrgWareHouse.java | 36 +++++++++++++++ .../i3plus/pojo/wms/bean/RefUserWareHouse.java | 36 +++++++++++++++ .../wms/repository/FactoryStoreRepository.java | 11 +---- .../pojo/wms/repository/WareHouseRepository.java | 16 +++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 +++--- 7 files changed, 148 insertions(+), 19 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/CustomerSendTo.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefOrgWareHouse.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefUserWareHouse.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WareHouseRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/CustomerSendTo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/CustomerSendTo.java new file mode 100644 index 0000000..eb5b76c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/CustomerSendTo.java @@ -0,0 +1,52 @@ +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; +import javax.persistence.Table; + +/** + * @Description : 工厂仓库 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-09-04 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="T_WMS_CUSTOMER_SENDTO") +@Api("客户发往地信息") +public class CustomerSendTo extends BaseBean { + + @Column(name="CUSTOMER_ID") + @ApiParam("客户端编号") + public String customerId; + + @Column(name="PART_ID") + @ApiParam("零件编号") + public String partId; + + @Column(name="CUSTOMER_PARTNO") + @ApiParam("客户零件号") + public String customerPartNo; + + @Column(name="ERP_PARTNO") + @ApiParam("ERP零件号") + public String ERPPartNo; + + @Column(name="CUSTOMER_SENDTO_CODE") + @ApiParam("客户发往地代码") + public String customerSendToCode; + + @Column(name="CUSTOMER_SENDTO_NAME") + @ApiParam("客户发往地名称") + public String customerSendToName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java index 97ec3c6..8a9668a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @Api("工厂仓库") public class FactoryStore extends BaseBean { - @Column(name="store_coded") + @Column(name="store_code") @ApiParam("仓库代码") public String storeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefOrgWareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefOrgWareHouse.java new file mode 100644 index 0000000..275677d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefOrgWareHouse.java @@ -0,0 +1,36 @@ +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; +import javax.persistence.Table; + +/** + * @Description : 仓库组织关系表 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-10-31 15:18 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="T_WMS_ORG_WAREHOUSE") +@Api("工厂仓库组织关系表") +public class RefOrgWareHouse extends BaseBean { + + @Column(name="ORG_ID") + @ApiParam("组织编号") + public String orgId; + + @Column(name="WAREHOUSE_ID") + @ApiParam("仓库编号") + public String storeId; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefUserWareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefUserWareHouse.java new file mode 100644 index 0000000..ba6e1bb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefUserWareHouse.java @@ -0,0 +1,36 @@ +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; +import javax.persistence.Table; + +/** + * @Description : 用户仓库关系表 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-10-31 15:18 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="T_WMS_USER_WAREHOUSE") +@Api("用户仓库关系表") +public class RefUserWareHouse extends BaseBean { + + @Column(name="USER_ID") + @ApiParam("用户编号") + public String userId; + + @Column(name="WAREHOUSE_ID") + @ApiParam("仓库编号") + public String storeId; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.java index 6ac7c30..ce111b5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.FactoryStore; +import cn.estsh.i3plus.pojo.wms.bean.WareHouse; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; @@ -15,13 +16,5 @@ import java.util.List; * @Modify: **/ @Repository -public interface FactoryStoreRepository extends BaseRepository { - - @Query(value="from FactoryStore fs where fs.isValid=1") - List listAll(); - - @Query(value="from FactoryStore fs where fs.isValid=2") - int countAll(); - - List findByStoreName(String storeName); +public interface FactoryStoreRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WareHouseRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WareHouseRepository.java new file mode 100644 index 0000000..18825fb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WareHouseRepository.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.WareHouse; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-09-13 9:47 + * @Modify: + **/ +@Repository +public interface WareHouseRepository extends BaseRepository { +} 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 7e424ba..863f641 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 @@ -1,11 +1,7 @@ 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; +import cn.estsh.i3plus.pojo.wms.bean.WareHouse; /** * @Description : 仓库管理对象封装 @@ -18,16 +14,16 @@ public class WmsHqlPack { /** * 工厂仓库模糊分页查询 - * @param factoryStore + * @param wareHouse * @return */ - public static String packHqlFactoryStore(FactoryStore factoryStore) { + public static String packHqlFactoryStore(WareHouse wareHouse) { StringBuffer result = new StringBuffer(); // 部门名称 - HqlPack.getStringLikerPack(factoryStore.getStoreCode(),"storeCode", result); + HqlPack.getStringLikerPack(wareHouse.getCode(),"code", result); // 部门代码 - HqlPack.getStringLikerPack(factoryStore.getStoreName(),"storeName", result); + HqlPack.getStringLikerPack(wareHouse.getName(),"name", result); return result.toString(); } From cdfa9f9822fb45e4fea4be84c091c91647309dba Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 1 Nov 2018 13:42:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?wms=E5=B7=A5=E5=8E=82=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java new file mode 100644 index 0000000..201f865 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -0,0 +1,52 @@ +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; +import javax.persistence.Table; + +/** + * @Description : 工厂仓库 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-09-04 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="T_WMS_WAREHOUSE") +@Api("工厂仓库信息") +public class WareHouse extends BaseBean { + + @Column(name="code") + @ApiParam("仓库代码") + public String code; + + @Column(name="name") + @ApiParam("仓库名称") + public String name; + + @Column(name="address") + @ApiParam("仓库地址") + public String address; + + @Column(name="telephone") + @ApiParam("仓库电话号码") + public String telephone; + + @Column(name="fax") + @ApiParam("仓库传真号码") + public String fax; + + @Column(name="contact") + @ApiParam("联系人") + public String contact; +}