From 433ac603fc3f2e9f7523b3b02305c9737931b886 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 1 Nov 2018 13:41:32 +0800 Subject: [PATCH 01/12] =?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 02/12] =?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; +} From 4cf396419d08a0252d634391ca809c532ef11365 Mon Sep 17 00:00:00 2001 From: Administrator <962239776@qq.com> Date: Thu, 1 Nov 2018 14:30:40 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/InterfaceDevice.java | 41 +++++++++++ .../estsh/i3plus/pojo/wms/bean/InterfaceType.java | 80 ++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java new file mode 100644 index 0000000..3ee748c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java @@ -0,0 +1,41 @@ +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 : amy + * @CreateDate : 2018-11-01 11:45 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="T_INTERFACE_DEVICE") +@Api("接口驱动类信息") +public class InterfaceDevice extends BaseBean { + + @Column(name="DEVICE_NAME") + @ApiParam("驱动名称") + private String deviceName; + + @Column(name="DEVICE_CLASSNAME") + @ApiParam("驱动类名称") + private String deviceClassname; + + @Column(name="STATUS") + @ApiParam("状态") + private String status; + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java new file mode 100644 index 0000000..eecb4f2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +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 : amy + * @CreateDate : 2018-11-01 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="T_INTERFACE_TYPE") +@Api("接口类型信息") +public class InterfaceType { + + @Column(name="TP_ID") + @ApiParam("接口编号") + private String tpId; + + @Column(name="TP_TYP") + @ApiParam("接口类型") + private String tpTyp; + + @Column(name="PB_NO") + @ApiParam("发布方编码") + private String pbNo; + + @Column(name="TP_NO") + @ApiParam("接口编码") + private String tpNo; + + @Column(name="TP_DESC") + @ApiParam("接口主题描述") + private String tpDesc; + + @Column(name="MES_TAB") + @ApiParam("接口业务表") + private String mesTab; + + @Column(name="MES_GROUP") + @ApiParam("业务表的分组条件") + private String mesGroup; + + @Column(name="MES_PK") + @ApiParam("业务表主键") + private String mesPk; + + @Column(name="ACT_TYPE") + @ApiParam("业务类型") + private Integer actType; + + @Column(name="ACT_DESC") + @ApiParam("业务描述") + private String actDesc; + + @Column(name="DEVICE_ID") + @ApiParam("驱动类编号") + private String deviceId; + + @Column(name="REQUEST_URL") + @ApiParam("服务器请求路径") + private String requestUrl; + + @Column(name="CFILE_PATH") + @ApiParam("客户文件路径") + private String cfilePath; + +} From f824f73733938329c5a3e23072577b1272809e70 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 1 Nov 2018 15:25:07 +0800 Subject: [PATCH 04/12] =?UTF-8?q?HQL=20=E5=88=AB=E5=90=8Do=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 0251050..8a894ae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -65,12 +65,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep if (((value instanceof Object[])) || ((value instanceof Collection))) { Object[] arraySerializable = (Object[]) value; if ((arraySerializable != null) && (arraySerializable.length > 0)) { - sb.append(" and o." + name + " in (:" + name.replace(".", "") + ")"); + sb.append(" and model." + name + " in (:" + name.replace(".", "") + ")"); } } else if (value == null) { - sb.append(" and o." + name + " is null "); + sb.append(" and model." + name + " is null "); } else { - sb.append(" and o." + name + "=:" + name.replace(".", "")); + sb.append(" and model." + name + "=:" + name.replace(".", "")); } } } @@ -132,7 +132,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public void deleteByProperties(String[] propName, Object[] propValue) { if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { - StringBuffer sb = new StringBuffer("delete from " + persistentClass.getName() + " o where 1=1 "); + StringBuffer sb = new StringBuffer("delete from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb,propName,propValue); Query query = entityManager.createQuery(sb.toString()); setParameter(query,propName,propValue); @@ -146,7 +146,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public void deleteByIdIn(long[] ids) { if(ids != null && ids.length > 0){ - String hql = "delete from " + persistentClass.getName() + " o where o.id in(:ids) "; + String hql = "delete from " + persistentClass.getName() + " model where model.id in(:ids) "; Query query = entityManager.createQuery(hql); query.setParameter("ids", Arrays.asList(ids)); @@ -178,7 +178,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep && (conditionValue != null) && (conditionValue.length > 0)) { StringBuffer sb = new StringBuffer(); - sb.append("update " + persistentClass.getName() + " o set "); + sb.append("update " + persistentClass.getName() + " model set "); for (int i = 0; i < propertyName.length; i++) { sb.append(propertyName[i] + " = :p_" + propertyName[i] + ","); } @@ -210,7 +210,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep && (propertyValue.length > 0) && (propertyName.length == propertyValue.length)) { StringBuffer sb = new StringBuffer(); - sb.append("update " + persistentClass.getName() + " o set "); + sb.append("update " + persistentClass.getName() + " model set "); for (int i = 0; i < propertyName.length; i++) { sb.append(propertyName[i] + " = :p_" + propertyName[i] + ","); } From 63eee71bb0bb5897ce5ee18fe206339c24cc13ff Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 1 Nov 2018 21:15:49 +0800 Subject: [PATCH 05/12] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo # Conflicts: # modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java --- .../cn/estsh/i3plus/pojo/base/tool/HqlPack.java | 73 +++++++++++++++++++--- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 28 ++++++++- 2 files changed, 88 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index f3902c5..85f6eed 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -30,9 +30,6 @@ public class HqlPack { * @param isShowTime 是否包含时分秒 */ public static void timeBuilder( String startDate,String endDate, String columnName, StringBuffer result, boolean isShowTime) { - startDate = getSafeParam(startDate); - endDate = getSafeParam(endDate); - if (startDate == null || startDate.trim().length() == 0) { startDate = "1900-01-01"; } else { @@ -49,6 +46,9 @@ public class HqlPack { if (isShowTime&& endDate.trim().length()<=11) { endDate+= " 23:59:59"; } + startDate = getSafeParam(startDate); + endDate = getSafeParam(endDate); + result.append(" and model." + columnName + " between '" + startDate + "' and '" + endDate + "'"); } @@ -61,14 +61,15 @@ public class HqlPack { * @param isShowTime 是否包含时分秒 */ public static void timeBuilder( String date, String columnName, StringBuffer result, Boolean showTaday,boolean isShowTime) { - date = getSafeParam(date); - - String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); - if(date != null && date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))){ - //只有一个逗号 - date = ""; - } if(date != null && date.trim().length() > 0){ + date = getSafeParam(date); + + String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); + if(date != null && date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))){ + //只有一个逗号 + date = ""; + } + String[] time = date.split(","); if(time.length == 1){ //只有开始日期，没有结束日期 @@ -410,4 +411,56 @@ public class HqlPack { result.append(" and dbo.CheckStrInArr('"+data+"',model."+columnName+")>0 "); } } + + /** + * 封装long或者int的整数对象成like语句 + * @param data 对象值 + * @param columnName 列名 + * @param result + */ + public static void getNumLikerPack(Object data,String columnName, StringBuffer result) { + if (data != null) { + data = getSafeParam(data); + result.append(" and model."+columnName+" like '%" + data + "%'"); + } + } + + /** + * 封装String对象成like语句 + * @param data 对象值 + * @param columnName 列名 + * @param result + */ + public static void getNumLikerPackOr(Object data,String columnName, StringBuffer result) { + if (data != null) { + data = getSafeParam(data); + result.append(" or model."+columnName+" like '%" + data + "%'"); + } + } + + /** + * 封装String对象成like语句(右侧模糊) + * @param data 对象值 + * @param columnName 列名 + * @param result + */ + public static void getNumRightLikerPack(Object data,String columnName, StringBuffer result) { + if (data != null) { + data = getSafeParam(data); + result.append(" and model."+columnName+" like '" + data + "%'"); + } + } + + /** + * 封装String对象成like语句(左侧模糊) + * @param data 对象值 + * @param columnName 列名 + * @param result + */ + public static void getNumLeftLikerPack(Object data,String columnName, StringBuffer result) { + if (data != null) { + data = getSafeParam(data); + result.append(" and model."+columnName+" like '%" + data + "'"); + } + } } 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 920dfb8..87b7b0e 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 @@ -203,9 +203,31 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(tool.getName(),"name",result); HqlPack.getNumEqualPack(tool.getToolTypeId(),"toolTypeId",result); HqlPack.getNumEqualPack(tool.getToolStatusId(),"toolStatusId",result); - HqlPack.getStringLikerPack(tool.getName(),"name",result); - HqlPack.getStringLikerPack(tool.getName(),"name",result); + HqlPack.getNumEqualPack(tool.getToolDataTypeId(),"toolDataTypeId",result); + HqlPack.getNumEqualPack(tool.getToolConnTypeId(),"toolConnTypeId",result); + HqlPack.getStringLikerPack(tool.getToolIp(),"toolIp",result); + HqlPack.getNumLikerPack(tool.getToolPort(),"toolPort",result); return result.toString(); } -} + + /** + * 消息复杂查询 + * @param sysMessage + * @return + */ + public static String packHqlSysMessage(SysMessage sysMessage){ + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getStringLikerPack(sysMessage.getMessageTitle(),"messageTitle",result); + HqlPack.getStringLikerPack(sysMessage.getMessageContent(),"messageContent",result); + HqlPack.getNumLikerPack(sysMessage.getMessageStatusId(),"messageStatusId",result); + HqlPack.getNumLikerPack(sysMessage.getMessageTypeId(),"messageTypeId",result); + HqlPack.getNumEqualPack(sysMessage.getMessageRecipientId(),"messageRecipientId",result); + HqlPack.getNumEqualPack(sysMessage.getMessageSendId(),"messageSendId",result); + HqlPack.timeBuilder(sysMessage.getCreateDatetime(),"createDatetime", result, false,false); + + return result.toString(); + } +} \ No newline at end of file From 978bb1e8be2f31e1531f27196d5d78b5197ceaae Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 1 Nov 2018 21:19:32 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20USER=5FLOGIN=5FNAME=5FEXCEPTION?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 103 +++++++++++---------- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 2 +- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- .../estsh/i3plus/pojo/platform/bean/SysMenu.java | 2 +- 4 files changed, 55 insertions(+), 54 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 50d3dfa..97b1a55 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -26,69 +26,70 @@ import java.io.Serializable; @JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换 public abstract class BaseBean implements Serializable { - private static final long serialVersionUID = 1L; - - //此处使用hibernate的主键策略方式 - //手动设置,使用iplus-platform-common中的idtool生成 - @Id - @GeneratedValue(generator = "IDGenerator") - @GenericGenerator(name = "IDGenerator", strategy = "assigned") - @Column(name="id") - @ApiParam(value = "主键",example = "0") - //将Long类型系列化成String避免精度丢失 - @JsonSerialize(using = ToStringSerializer.class) - public Long id; - //get单独处理 - public Long getId() { - if(id != null) { - return id.longValue(); - }else{ - return id; - } + private static final long serialVersionUID = 1L; + + //此处使用hibernate的主键策略方式 + //手动设置,使用iplus-platform-common中的idtool生成 + //将Long类型系列化成String避免精度丢失 + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name="id") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; } + } - @Column(name="factory_code") - @ApiParam(value = "工厂代码") - public String factoryCode; + @Column(name="factory_code") + @ApiParam(value = "工厂代码") + public String factoryCode; - @Column(name="is_valid") - @ApiParam(value = "有效性",example = "1") - public Integer isValid; //EnumUtil.isValid; + @Column(name="is_valid") + @ApiParam(value = "有效性",example = "1") + public Integer isValid; //EnumUtil.isValid; - @Column(name="create_user") - @ApiParam(value = "创建日期") - public String createUser; + @Column(name="create_user") + @ApiParam(value = "创建日期") + public String createUser; - @Column(name="create_date") - @ApiParam(value = "创建日期") - public String createDatetime; + @Column(name="create_date") + @ApiParam(value = "创建日期") + public String createDatetime; - @Column(name="modify_user") - @ApiParam(value = "修改人") - public String modifyUser; + @Column(name="modify_user") + @ApiParam(value = "修改人") + public String modifyUser; - @Column(name="modify_date") - @ApiParam(value = "修改日期") - public String modifyDatetime; + @Column(name="modify_date") + @ApiParam(value = "修改日期") + public String modifyDatetime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用，查询起始日期",example = "2000-01-01 01:00:00") - public transient String createDateTimeStart; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询起始日期",example = "2000-01-01 01:00:00") + public transient String createDateTimeStart; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用，查询结束日期",example = "2000-01-01 01:00:00") - public transient String createDateTimeEnd; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询结束日期",example = "2000-01-01 01:00:00") + public transient String createDateTimeEnd; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="修改日期查询用，查询起始日期",example = "用于前台查询") - public transient String modifyDateTimeStart; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="修改日期查询用，查询起始日期",example = "用于前台查询") + public transient String modifyDateTimeStart; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "修改日期查询用，查询结束日期",example = "用于前台查询") - public transient String modifyDateTimeEnd; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "修改日期查询用，查询结束日期",example = "用于前台查询") + public transient String modifyDateTimeEnd; - @ApiParam(value = "排序属性") - public transient String orderByParam; + @ApiParam(value = "排序属性") + public transient String orderByParam; @ApiParam(value = "排序属性",example = "1") //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 431dbb7..86021d7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -80,7 +80,7 @@ public interface BaseRepository extends JpaReposito * 通过 in 批量删除 * @param ids 熟悉值数组 */ - public void deleteByIdIn(long[] ids); + public void deleteByIds(long[] ids); /** * 通过多单属性进行单个值更新 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 8a894ae..843eb68 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -144,7 +144,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public void deleteByIdIn(long[] ids) { + public void deleteByIds(long[] ids) { if(ids != null && ids.length > 0){ String hql = "delete from " + persistentClass.getName() + " model where model.id in(:ids) "; Query query = entityManager.createQuery(hql); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index dfb816f..3dc903b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -82,7 +82,7 @@ public class SysMenu extends BaseBean { @Column(name="MENU_STATUS") @ApiParam(value ="功能状态（1.正常，2.禁用）" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1") - private Integer menuStatus = 1; + private Integer menuStatus; @ApiParam(value ="子集列表") private transient List childList; From c398e5f11c00745e23eba0d0561cf4dc004e70db Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 1 Nov 2018 21:33:31 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 114 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 113 ++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 40 ++++++++ 3 files changed, 267 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java new file mode 100644 index 0000000..c0bd9ef --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -0,0 +1,114 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import io.swagger.models.auth.In; +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 : jimmy.zeng + * @CreateDate : 2018-11-01 13:21 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_TRANS") +@DynamicInsert +@DynamicUpdate +@Api(value="仓库交易记录表",description = "仓库交易记录表") +public class WmsTrans extends BaseBean{ + + @Column(name="ORDER_NO") + @ApiParam(value ="单据编号") + private String orderNo; + + @Column(name="SN") + @ApiParam(value ="箱条码") + private String sn; + + @Column(name="PART_ID") + @ApiParam(value ="零件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long partId; + + @Column(name="PART_No") + @ApiParam(value ="零件编号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam(value ="零件名称") + private String partNameRdd; + + @Column(name="TRANS_STATUS") + @ApiParam(value ="交易状态") + private String Trans_status; + + @Column(name="QTY") + @ApiParam(value ="需求数") + private Double qty; + + @Column(name="TRANS_CODE") + @ApiParam(value ="交易类型") + private String transCode; + + @Column(name="DATASOURCE") + @ApiParam(value ="数据来源") + private Integer dataSource; + + @Column(name="UNIT") + @ApiParam(value ="单位") + private String unit; + + @Column(name="SRC_LOC_ID") + @ApiParam(value ="来源库位id") + @JsonSerialize(using = ToStringSerializer.class) + private Long srcLocId; + + @Column(name="SRC_LOC_CODE") + @ApiParam(value ="来源库位代码") + private String srcLocCode; + + @Column(name="DEST_LOC_ID") + @ApiParam(value ="目标库位id") + @JsonSerialize(using = ToStringSerializer.class) + private Long destLocId; + + @Column(name="DEST_LOC_CODE") + @ApiParam(value ="目标库位代码") + private String destLocCode; + + public Long getSrcLocId() { + if(srcLocId != null) { + return srcLocId.longValue(); + }else{ + return srcLocId; + } + } + + public Long getPartId() { + if(partId != null) { + return partId.longValue(); + }else{ + return partId; + } + } + + public Long getDestLocId() { + if(destLocId != null) { + return destLocId.longValue(); + }else{ + return destLocId; + } + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java new file mode 100644 index 0000000..8b49c9f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -0,0 +1,113 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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 : jimmy.zeng + * @CreateDate : 2018-11-01 16:22 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_TRANS_RCD") +@DynamicInsert +@DynamicUpdate +@Api(value="仓库交易归档表",description = "仓库交易归档表") +public class WmsTransRcd extends BaseBean{ + + @Column(name="ORDER_NO") + @ApiParam(value ="单据编号") + private String orderNo; + + @Column(name="SN") + @ApiParam(value ="箱条码") + private String sn; + + @Column(name="PART_ID") + @ApiParam(value ="零件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long partId; + + @Column(name="PART_No") + @ApiParam(value ="零件编号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam(value ="零件名称") + private String partNameRdd; + + @Column(name="TRANS_STATUS") + @ApiParam(value ="交易状态") + private Integer TransStatus; + + @Column(name="QTY") + @ApiParam(value ="需求数") + private Double qty; + + @Column(name="TRANS_CODE") + @ApiParam(value ="交易类型") + private String transCode; + + @Column(name="DATASOURCE") + @ApiParam(value ="数据来源") + private Integer dataSource; + + @Column(name="UNIT") + @ApiParam(value ="单位") + private String unit; + + @Column(name="SRC_LOC_ID") + @ApiParam(value ="来源库位id") + @JsonSerialize(using = ToStringSerializer.class) + private Long srcLocId; + + @Column(name="SRC_LOC_CODE") + @ApiParam(value ="来源库位代码") + private String srcLocCode; + + @Column(name="DEST_LOC_ID") + @ApiParam(value ="目标库位id") + @JsonSerialize(using = ToStringSerializer.class) + private Long destLocId; + + @Column(name="DEST_LOC_CODE") + @ApiParam(value ="目标库位代码") + private String destLocCode; + + public Long getSrcLocId() { + if(srcLocId != null) { + return srcLocId.longValue(); + }else{ + return srcLocId; + } + } + + public Long getPartId() { + if(partId != null) { + return partId.longValue(); + }else{ + return partId; + } + } + + public Long getDestLocId() { + if(destLocId != null) { + return destLocId.longValue(); + }else{ + return destLocId; + } + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java new file mode 100644 index 0000000..91f6cda --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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 : jimmy.zeng + * @CreateDate : 2018-11-01 11:57 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_TRANS_TYPE") +@DynamicInsert +@DynamicUpdate +@Api(value="交易类型表",description = "交易类型表") +public class WmsTransType extends BaseBean{ + + @Column(name="TRANS_CODE") + @ApiParam(value ="交易代码") + @JsonSerialize(using = ToStringSerializer.class) + private String transCode; + + @Column(name="TRANS_NAME") + @ApiParam(value ="交易名称") + private String transName; + +} From 7479104bb9ee7d119dde645ef45da76f6a2da71e Mon Sep 17 00:00:00 2001 From: Administrator <962239776@qq.com> Date: Fri, 2 Nov 2018 09:30:32 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=A9=B1=E5=8A=A8?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/InterfaceDevice.java | 12 ++--- .../estsh/i3plus/pojo/wms/bean/InterfaceType.java | 52 +++++++++++++++------- .../wms/repository/InterfaceDeviceRepository.java | 16 +++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 ++++++ 4 files changed, 71 insertions(+), 22 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java index 3ee748c..d3dc77f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java @@ -26,16 +26,16 @@ import javax.persistence.Table; @Api("接口驱动类信息") public class InterfaceDevice extends BaseBean { - @Column(name="DEVICE_NAME") + @Column(name="device_name") @ApiParam("驱动名称") private String deviceName; - @Column(name="DEVICE_CLASSNAME") + @Column(name="device_classname") @ApiParam("驱动类名称") - private String deviceClassname; + private String deviceClassName; - @Column(name="STATUS") - @ApiParam("状态") - private String status; + @Column(name="status") + @ApiParam("状态 【0-禁用 1-正常】") + private Integer status; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java index eecb4f2..39d7dd6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -23,58 +26,75 @@ import javax.persistence.Table; @DynamicUpdate @Table(name="T_INTERFACE_TYPE") @Api("接口类型信息") -public class InterfaceType { +public class InterfaceType extends BaseBean { - @Column(name="TP_ID") + @Column(name="tp_id") @ApiParam("接口编号") - private String tpId; + @JsonSerialize(using = ToStringSerializer.class) + private Long tpId; - @Column(name="TP_TYP") + @Column(name="tp_typ") @ApiParam("接口类型") private String tpTyp; - @Column(name="PB_NO") + @Column(name="pb_no") @ApiParam("发布方编码") private String pbNo; - @Column(name="TP_NO") + @Column(name="tp_no") @ApiParam("接口编码") private String tpNo; - @Column(name="TP_DESC") + @Column(name="tp_desc") @ApiParam("接口主题描述") private String tpDesc; - @Column(name="MES_TAB") + @Column(name="mes_tab") @ApiParam("接口业务表") private String mesTab; - @Column(name="MES_GROUP") + @Column(name="mes_group") @ApiParam("业务表的分组条件") private String mesGroup; - @Column(name="MES_PK") + @Column(name="mes_pk") @ApiParam("业务表主键") private String mesPk; - @Column(name="ACT_TYPE") + @Column(name="act_type") @ApiParam("业务类型") private Integer actType; - @Column(name="ACT_DESC") + @Column(name="act_desc") @ApiParam("业务描述") private String actDesc; - @Column(name="DEVICE_ID") + @Column(name="device_id") @ApiParam("驱动类编号") - private String deviceId; + @JsonSerialize(using = ToStringSerializer.class) + private Long deviceId; - @Column(name="REQUEST_URL") + @Column(name="request_url") @ApiParam("服务器请求路径") private String requestUrl; - @Column(name="CFILE_PATH") + @Column(name="cfile_path") @ApiParam("客户文件路径") private String cfilePath; + public Long getTpId() { + if(tpId != null) { + return tpId.longValue(); + }else{ + return tpId; + } + } + + public Long getDeviceId() { + if(deviceId != null) { + return deviceId.longValue(); + }else{ + return deviceId; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java new file mode 100644 index 0000000..62a206c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.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.InterfaceDevice; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-01 15:13 + * @Modify: + **/ +@Repository +public interface InterfaceDeviceRepository 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 863f641..3bc083a 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,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; import cn.estsh.i3plus.pojo.wms.bean.WareHouse; /** @@ -27,4 +28,16 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 接口驱动类信息 分页查询 + * @return + */ + public static String packHqlInterfaceDevice(InterfaceDevice interfaceDevice){ + StringBuffer sb = new StringBuffer(); + //驱动类名称 + HqlPack.getStringEqualPack(interfaceDevice.getDeviceClassName(),"deviceClassName",sb); + + return null; + } } From e36c33969f622ef11ad8f954e4589fc03e60d027 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 2 Nov 2018 09:55:17 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/repository/WmsTransRcdRepository.java | 14 ++++++++++++++ .../i3plus/pojo/wms/repository/WmsTransRepository.java | 14 ++++++++++++++ .../i3plus/pojo/wms/repository/WmsTransTypeRepository.java | 14 ++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRcdRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRcdRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRcdRepository.java new file mode 100644 index 0000000..42395be --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRcdRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransRcd; + +/** + * @Description : 仓库交易归档表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-02 9:50 + * @Modify: + **/ +public interface WmsTransRcdRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRepository.java new file mode 100644 index 0000000..d9f9ce3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTrans; + +/** + * @Description : 仓库交易记录表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-02 9:49 + * @Modify: + **/ +public interface WmsTransRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java new file mode 100644 index 0000000..f58d5e0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; + +/** + * @Description : 交易类型表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-02 9:49 + * @Modify: + **/ +public interface WmsTransTypeRepository extends BaseRepository { +} From 468ab162a555d44964597ffde90accd5abdfebe4 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 2 Nov 2018 14:43:36 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 39 ++++++++-------------- .../cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 38 ++++++++------------- .../wms/repository/WmsTransTypeRepository.java | 1 + .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 10 ++++++ 4 files changed, 37 insertions(+), 51 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index c0bd9ef..e4657c3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; -import io.swagger.models.auth.In; import lombok.Data; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -70,29 +69,25 @@ public class WmsTrans extends BaseBean{ @ApiParam(value ="单位") private String unit; - @Column(name="SRC_LOC_ID") - @ApiParam(value ="来源库位id") + @Column(name="LOC_ID") + @ApiParam(value ="库位id") @JsonSerialize(using = ToStringSerializer.class) - private Long srcLocId; + private Long locId; - @Column(name="SRC_LOC_CODE") - @ApiParam(value ="来源库位代码") - private String srcLocCode; + @Column(name="SLOC_CODE") + @ApiParam(value ="库位代码") + private String locCode; - @Column(name="DEST_LOC_ID") - @ApiParam(value ="目标库位id") + @Column(name="GROUP_ID") + @ApiParam(value ="分组id") @JsonSerialize(using = ToStringSerializer.class) - private Long destLocId; + private Long groupId; - @Column(name="DEST_LOC_CODE") - @ApiParam(value ="目标库位代码") - private String destLocCode; - - public Long getSrcLocId() { - if(srcLocId != null) { - return srcLocId.longValue(); + public Long getLocId() { + if(locId != null) { + return locId.longValue(); }else{ - return srcLocId; + return locId; } } @@ -103,12 +98,4 @@ public class WmsTrans extends BaseBean{ return partId; } } - - public Long getDestLocId() { - if(destLocId != null) { - return destLocId.longValue(); - }else{ - return destLocId; - } - } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 8b49c9f..5c38f65 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -69,29 +69,25 @@ public class WmsTransRcd extends BaseBean{ @ApiParam(value ="单位") private String unit; - @Column(name="SRC_LOC_ID") - @ApiParam(value ="来源库位id") + @Column(name="LOC_ID") + @ApiParam(value ="库位id") @JsonSerialize(using = ToStringSerializer.class) - private Long srcLocId; + private Long locId; - @Column(name="SRC_LOC_CODE") - @ApiParam(value ="来源库位代码") - private String srcLocCode; + @Column(name="SLOC_CODE") + @ApiParam(value ="库位代码") + private String locCode; - @Column(name="DEST_LOC_ID") - @ApiParam(value ="目标库位id") + @Column(name="GROUP_ID") + @ApiParam(value ="分组id") @JsonSerialize(using = ToStringSerializer.class) - private Long destLocId; + private Long groupId; - @Column(name="DEST_LOC_CODE") - @ApiParam(value ="目标库位代码") - private String destLocCode; - - public Long getSrcLocId() { - if(srcLocId != null) { - return srcLocId.longValue(); + public Long getLocId() { + if(locId != null) { + return locId.longValue(); }else{ - return srcLocId; + return locId; } } @@ -102,12 +98,4 @@ public class WmsTransRcd extends BaseBean{ return partId; } } - - public Long getDestLocId() { - if(destLocId != null) { - return destLocId.longValue(); - }else{ - return destLocId; - } - } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java index f58d5e0..0c453f1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransTypeRepository.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.WmsTransType; +import org.springframework.stereotype.Repository; /** * @Description : 交易类型表 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 3bc083a..8634073 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; import cn.estsh.i3plus.pojo.wms.bean.WareHouse; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; /** * @Description : 仓库管理对象封装 @@ -40,4 +41,13 @@ public class WmsHqlPack { return null; } + + public static String packHqlWmsTransType(WmsTransType wmsTransType) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsTransType.getTransCode(),"transCode",result); + + return result.toString(); + } } From 26f30ec92be0ef78bd5204738696ff8bdfea74b9 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 2 Nov 2018 14:44:57 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index e4657c3..70f7448 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -74,7 +74,7 @@ public class WmsTrans extends BaseBean{ @JsonSerialize(using = ToStringSerializer.class) private Long locId; - @Column(name="SLOC_CODE") + @Column(name="LOC_CODE") @ApiParam(value ="库位代码") private String locCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 5c38f65..4a3a8f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -74,7 +74,7 @@ public class WmsTransRcd extends BaseBean{ @JsonSerialize(using = ToStringSerializer.class) private Long locId; - @Column(name="SLOC_CODE") + @Column(name="LOC_CODE") @ApiParam(value ="库位代码") private String locCode; From da9b042cf0c99d921f9a731d21590559f58463b2 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 2 Nov 2018 15:52:18 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 6 +++--- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 70f7448..8519f11 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -14,7 +14,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description : 仓库交易记录表 + * @Description : 库存交易记录表 * @Reference : * @Author : jimmy.zeng * @CreateDate : 2018-11-01 13:21 @@ -25,7 +25,7 @@ import javax.persistence.Table; @Table(name="WMS_TRANS") @DynamicInsert @DynamicUpdate -@Api(value="仓库交易记录表",description = "仓库交易记录表") +@Api(value="库存交易记录表",description = "库存交易记录表") public class WmsTrans extends BaseBean{ @Column(name="ORDER_NO") @@ -51,7 +51,7 @@ public class WmsTrans extends BaseBean{ @Column(name="TRANS_STATUS") @ApiParam(value ="交易状态") - private String Trans_status; + private Integer transStatus; @Column(name="QTY") @ApiParam(value ="需求数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 4a3a8f8..b27dfb8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -51,7 +51,7 @@ public class WmsTransRcd extends BaseBean{ @Column(name="TRANS_STATUS") @ApiParam(value ="交易状态") - private Integer TransStatus; + private Integer transStatus; @Column(name="QTY") @ApiParam(value ="需求数") 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 8634073..092edb1 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 @@ -46,7 +46,8 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getNumEqualPack(wmsTransType.getTransCode(),"transCode",result); + HqlPack.getStringEqualPack(wmsTransType.getTransCode(),"transCode",result); + HqlPack.getStringEqualPack(wmsTransType.getTransName(),"transName",result); return result.toString(); }