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 40a7d22..cdf8465 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 @@ -48,9 +48,9 @@ public abstract class BaseBean implements Serializable { } } - @Column(name="factory_code") - @ApiParam(value = "工厂代码") - public String factoryCode; + @Column(name="ORGANIZE_CODE") + @ApiParam(value ="组织代码") + private String organizeCode; @Column(name="is_valid") @ApiParam(value = "有效性",example = "1") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 54b1d81..30cb2cf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -50,6 +50,16 @@ public class CommonEnumUtil { return tmp; } + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -492,4 +502,27 @@ public class CommonEnumUtil { } } + /** + * 启用或禁用 + */ + public enum OPEN_CLOSE { + OPEN(1, "启用"), + CLOSE(2, "禁用"); + + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + OPEN_CLOSE(int value, String description) { + this.value = value; + this.description = description; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 33cc49f..174f829 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -89,8 +89,7 @@ public class ImppEnumUtil { public enum TASK_METHOD_TYPE{ TYPE_GROUP(1,"类方法","Java Class 方法"), TYPE_COMPANY(2,"链接","Http URL"), - TYPE_FACTORY(3,"权限CODE","权限CODE"), - ; + TYPE_FACTORY(3,"权限CODE","权限CODE"); private int value; private String name; @@ -229,21 +228,22 @@ public class ImppEnumUtil { * 4.SELECT：查询 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum LOG_TYPE{ + public enum OPERATE_TYPE{ - INSERT(1,"新增","新增"), - DELETE(2,"修改","修改"), - UPDATE(3,"删除","删除"), - SELECT(4,"查询","查询"); + INSERT(1,"post","新增"), //POST + DELETE(2,"put","修改"), //PUT + UPDATE(3,"delete","删除"), //DELETE + SELECT(4,"get","查询"), //GET + BUSI(5,"busi","处理"); private int value; private String name; private String description; - LOG_TYPE() { + OPERATE_TYPE() { } - LOG_TYPE(int value, String name, String description) { + OPERATE_TYPE(int value, String name, String description) { this.value = value; this.name = name; this.description = description; @@ -281,6 +281,16 @@ public class ImppEnumUtil { return tmp; } + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + public static String codeOfDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -299,18 +309,16 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OPERATE_TERMINAL{ - PC(1,"个人计算机","个人计算机"); + PC(1,"电脑端"),PDA(2,"PDA"),MOBILE(3,"手机"); private int value; - private String name; private String description; OPERATE_TERMINAL() { } - OPERATE_TERMINAL(int value, String name, String description) { + OPERATE_TERMINAL(int value, String description) { this.value = value; - this.name = name; this.description = description; } @@ -318,24 +326,10 @@ public class ImppEnumUtil { return value; } - public String getName() { - return name; - } - public String getDescription() { return description; } - public static String valueOfCode(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].name; - } - } - return tmp; - } - public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -346,15 +340,6 @@ public class ImppEnumUtil { return tmp; } - public static String codeOfDescription(String code) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].name.equals(code)) { - tmp = values()[i].description; - } - } - return tmp; - } } /** 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 8c98c20..b0c41a1 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 @@ -135,6 +135,13 @@ public interface BaseRepository extends JpaReposito public int updateByHqlWhere(String hqlWhere,String propertyName, Object propertyValue); /** + * 批量弱删除仓库信息 + * @param ids + * @return + */ + public boolean deleteWeaklyByIds(Long[] ids) ; + + /** * 批量修改数据熟悉 * @param hqlWhere HQL where 语句 * @param propertyName 修改的字段名称 @@ -233,4 +240,6 @@ public interface BaseRepository extends JpaReposito public List findBySqlObjList(String sql); public List findBySqlObjListByPager(String sql,Pager pager); + + } 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 a52e183..7f78c9a 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 @@ -782,6 +782,28 @@ public class BaseRepositoryImpl extends SimpleJpaRep } /** + * 批量弱删除 + * @param ids + * @return + */ + @Override + public boolean deleteWeaklyByIds(Long[] ids) { + if(ids != null && ids.length > 0){ + String hql = "update " + persistentClass.getName() + " model where model.id in(:ids) "; + Query query = entityManager.createQuery(hql); + query.setParameter("ids", Arrays.asList(ids)); + + int delResult = query.executeUpdate(); + if (delResult == ids.length) { + return true; + } + }else{ + throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! ids:" + ids); + } + return false; + } + + /** * 保存对象 * @param item 保存对象 * @return diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/FactoryStore.java similarity index 94% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/FactoryStore.java index 8a9668a..09172ce 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/FactoryStore.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/FactoryStore.java @@ -1,5 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean; - +package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java index aeb04e5..da111f8 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java @@ -13,7 +13,7 @@ import javax.persistence.Table; import java.text.DecimalFormat; /** - * @Description : 操作日志表 + * @Description : 用户操作日志表 * @Reference : * @Author : wei.peng * @Date : 2018-10-22 16:58:42.720 @@ -28,35 +28,16 @@ import java.text.DecimalFormat; public class LogOperate extends BaseBean { @Column(name="OPERATE_MODULE_ID") - @ApiParam(value ="操作模块（枚举）" , example = "-1") + @ApiParam(value ="系统模块（枚举）", example = "1") + //CommonEnumUtil.SOFT_TYPE private Integer operateModuleId; @Column(name="OPERATE_TYPE_ID（枚举）") + //ImppEnumUtil.OPERATE_TYPE @ApiParam(value ="操作类型" , example = "-1") private Integer operateTypeId; - - @Column(name="OPERATE_OBJECT") - @ApiParam(value ="操作对象" ) - private String operateObject; - - @Column(name="OPERATE_FIRST_DATA") - @ApiParam(value ="操作前数据") - private String operateFirstData; - - @Column(name="OPERATE_LAST_DATA") - @ApiParam(value ="操作后数据") - private String operateLastData; - - @Column(name="OPERATE_IP") - @ApiParam(value ="服务器IP") - private String operateIp; - - @Column(name="OPERATE_TERMINAL") - @ApiParam(value ="操作终端（枚举）" , example = "1") - private Integer operateTerminal; - - @Column(name="OPERATE_USER_NAME") - @ApiParam(value ="操作人名称" , access ="操作人名称") - private String operateUserName; + @Column(name="OPERATE_MESSAGE") + @ApiParam(value ="操作信息" , access ="操作信息") + private String operateMessage; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java index f868d5e..5086cab 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java @@ -27,33 +27,58 @@ import java.text.DecimalFormat; @Api(value="系统日志表",description = "系统日志表") public class LogSystem extends BaseBean { + @Column(name="LOG_LEVEL") + @ApiParam(value ="日志级别" , example ="1") + //ImppEnumUtil.LOG_LEVEL + private Integer logLevel; @Column(name="LOG_MODULE_ID") @ApiParam(value ="系统模块（枚举）", example = "1") + //CommonEnumUtil.SOFT_TYPE private Integer logModuleId; - @Column(name="LOG_IP") - @ApiParam(value ="服务器IP" , access ="服务器IP") - private String logIp; - + @Column(name="REMOTE_IP") + @ApiParam(value ="请求IP" , access ="请求IP") + private String remoteIp; + + @Column(name="REQUEST_URL") + @ApiParam(value ="请求路径" , access ="请求路径") + private String requestUrl; + + @Column(name="HTTP_METHOD") + @ApiParam(value ="http请求方法" , access ="http请求方法") + private String httpMethod;; + @Column(name="LOG_CLASS") - @ApiParam(value ="触发路径" , access ="触发路径") + @ApiParam(value ="触发类路径" , access ="触发类路径") private String logClass; @Column(name="LOG_METHOD") @ApiParam(value ="触发方法" , access ="触发方法") private String logMethod; + + @Column(name="ARGS_COUNT") + @ApiParam(value ="入参数量" , access ="入参数量") + private Integer argsCount; + + @Column(name="LOG_ARGS") + @ApiParam(value ="方法入参" , access ="方法入参") + private String logArgs; - @Column(name="LOG_LEVEL_ID") - @ApiParam(value ="日志级别（1.DEBUG，2.INFO，3.ERROR）" , example ="1") - private Integer logLevelId; - - @Column(name="LOG_MESSAGE") - @ApiParam(value ="日志信息" , access ="日志信息") - private String logMessage; - - @Column(name="LOG_USER_NAME") - @ApiParam(value ="操作人名称" , access ="操作人名称") - private String logUserName; + @Column(name="LOG_TITLE") + @ApiParam(value ="日志标题") + private String logTitle; + + @Column(name="LOG_DETAIL") + @ApiParam(value ="日志详情") + private String logDetail; + + @Column(name="SERVER_HOST") + @ApiParam(value ="服务器") + //hostName + ip + private String serverHost; + @Column(name="EXECUTE_TIME") + @ApiParam(value ="执行耗时") + private long executeTime; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java index ebc7b4a..3c3a968 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.platform.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.platform.bean.LogOperate; -import org.springframework.data.mongodb.repository.MongoRepository; /** * @Description : 操作日志表(使用Mongodb) @@ -12,5 +10,6 @@ import org.springframework.data.mongodb.repository.MongoRepository; * @Date : 2018-10-22 12:03:00.118 * @Modify : **/ -public interface LogOperateRepository extends BaseMongoRepository { -} + +//public interface LogOperateRepository extends BaseMongoRepository { +//} 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 deleted file mode 100644 index eb5b76c..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/CustomerSendTo.java +++ /dev/null @@ -1,52 +0,0 @@ -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/InterfaceDevice.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java deleted file mode 100644 index d3dc77f..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceDevice.java +++ /dev/null @@ -1,41 +0,0 @@ -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("状态 【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 deleted file mode 100644 index 39d7dd6..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/InterfaceType.java +++ /dev/null @@ -1,100 +0,0 @@ -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 : amy - * @CreateDate : 2018-11-01 11:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name="T_INTERFACE_TYPE") -@Api("接口类型信息") -public class InterfaceType extends BaseBean { - - @Column(name="tp_id") - @ApiParam("接口编号") - @JsonSerialize(using = ToStringSerializer.class) - private Long 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("驱动类编号") - @JsonSerialize(using = ToStringSerializer.class) - private Long deviceId; - - @Column(name="request_url") - @ApiParam("服务器请求路径") - private String requestUrl; - - @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/bean/RefOrgWareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefOrgWareHouse.java deleted file mode 100644 index 275677d..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefOrgWareHouse.java +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index ba6e1bb..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/RefUserWareHouse.java +++ /dev/null @@ -1,36 +0,0 @@ -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/bean/StockArea.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java deleted file mode 100644 index 0f59530..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockArea.java +++ /dev/null @@ -1,60 +0,0 @@ -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 : alwaysfrin - * @CreateDate : 2018-09-04 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name="WH_STOCK_AREA") -@Api("仓库区域") -public class StockArea extends BaseBean { - - @Column(name="AREA_CODE") - @ApiParam("仓库区域代码") - public String areaCode; - - @Column(name="AREA_NAME") - @ApiParam("仓库区域名称") - public String areaName; - - @Column(name="WH_ID") - @ApiParam(value = "仓库编号", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - public Long whId; - - @Column(name="WH_CODE_RDD") - @ApiParam("仓库代码") - public String whCodeRdd; - - @Column(name="WH_NAME_RDD") - @ApiParam("仓库名称") - public String whNameRdd; - - public Long getWhId() { - if(whId != null) { - return whId.longValue(); - }else{ - return whId; - } - } - -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java deleted file mode 100644 index c44b785..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/StockLocation.java +++ /dev/null @@ -1,59 +0,0 @@ -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 : alwaysfrin - * @CreateDate : 2018-09-04 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name="WH_STOCK_LOC") -@Api("仓库库位") -public class StockLocation extends BaseBean { - - @Column(name="LOC_CODE") - @ApiParam("仓库库位代码") - public String locCode; - - @Column(name="LOC_NAME") - @ApiParam("仓库库位名称") - public String locName; - - @Column(name="AREA_ID") - @ApiParam(value = "库区编号", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - public Long areaId; - - @Column(name="AREA_CODE_RDD") - @ApiParam("库区代码") - public String areaCodeRdd; - - @Column(name="AREA_NAME_RDD") - @ApiParam("库区名称") - public String areaNameRdd; - - public Long getAreaId() { - if(areaId != null) { - return areaId.longValue(); - }else{ - return areaId; - } - } -} 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 index 201f865..f847cac 100644 --- 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 @@ -14,39 +14,28 @@ import javax.persistence.Table; /** * @Description : 工厂仓库 * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-04 15:58 + * @Author : amy + * @CreateDate : 2018-11-06 15:58 * @Modify: **/ @Data @Entity @DynamicInsert @DynamicUpdate -@Table(name="T_WMS_WAREHOUSE") +@Table(name="WMS_WAREHOUSE") @Api("工厂仓库信息") public class WareHouse extends BaseBean { - @Column(name="code") + @Column(name="CODE") @ApiParam("仓库代码") public String code; - @Column(name="name") + @Column(name="NAME") @ApiParam("仓库名称") public String name; - @Column(name="address") + @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; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java index 9ec77db..4b40af3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsField.java @@ -103,11 +103,11 @@ public class WmsField extends BaseBean{ private String defaulter; @Column(name = "ADD_STATUS") - @ApiParam("状态") + @ApiParam(value = "状态", example = "1") private Integer addStatus; @Column(name = "DATA_TYPE") - @ApiParam("数据类型") + @ApiParam(value = "数据类型", example = "1") private Integer dataType; @Column(name = "DATA_TYPE_NAME") @@ -115,11 +115,11 @@ public class WmsField extends BaseBean{ private String dataTypeName; @Column(name = "DATA_SIZE") - @ApiParam("整数位长度") + @ApiParam(value = "整数位长度", example = "1") private Integer dataSize; @Column(name = "DATA_DECIMAL") - @ApiParam("小数位长度") + @ApiParam(value = "小数位长度", example = "1") private Integer dataDecimal; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java index bd18537..fdd7066 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java @@ -4,6 +4,7 @@ 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.ApiModelProperty; import io.swagger.annotations.ApiParam; import lombok.Data; import org.hibernate.annotations.DynamicInsert; @@ -64,7 +65,7 @@ public class WmsStockQuant extends BaseBean{ private String unit; @Column(name="QIT") - @ApiParam(value ="库存数") + @ApiParam(value ="库存数", example = "0") private Double qit; @Column(name="ERP_WAREHOUSE") 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 047ec43..31d956b 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 @@ -78,7 +78,7 @@ public class WmsTrans extends BaseBean{ @ApiParam(value ="库位代码") private String locCode; - @ApiParam(value ="目标库位id") + @ApiParam(value ="目标库位id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) private transient Long targetLocId; 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 8cb4e15..d53d5a3 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 @@ -62,7 +62,7 @@ public class WmsTransRcd extends BaseBean{ private String transCode; @Column(name="DATASOURCE") - @ApiParam(value ="数据来源") + @ApiParam(value ="数据来源", example = "1") private Integer dataSource; @Column(name="UNIT") @@ -83,7 +83,7 @@ public class WmsTransRcd extends BaseBean{ @JsonSerialize(using = ToStringSerializer.class) private Long groupId; - @ApiParam(value ="库存数") + @ApiParam(value ="库存数", example = "0") private transient Double qit; 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 deleted file mode 100644 index ce111b5..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/FactoryStoreRepository.java +++ /dev/null @@ -1,20 +0,0 @@ -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; - -import java.util.List; - -/** - * @Description : 对象持久层仓用方法控制 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-13 9:47 - * @Modify: - **/ -@Repository -public interface FactoryStoreRepository extends BaseRepository { -} 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 deleted file mode 100644 index 62a206c..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/InterfaceDeviceRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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/repository/StockAreaRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockAreaRepository.java deleted file mode 100644 index 21c260d..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockAreaRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.StockArea; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; - -/** - * @Description : 库区表 - * @Reference : - * @Author : jessica.chen - * @CreateDate : 2018-11-04 12:02 - * @Modify: - **/ -public interface StockAreaRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockLocationRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockLocationRepository.java deleted file mode 100644 index 32832f1..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/StockLocationRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.StockArea; -import cn.estsh.i3plus.pojo.wms.bean.StockLocation; - -/** - * @Description : 库位表 - * @Reference : - * @Author : jessica.chen - * @CreateDate : 2018-11-04 14:33 - * @Modify: - **/ -public interface StockLocationRepository 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 index 18825fb..cce89d7 100644 --- 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 @@ -7,8 +7,8 @@ import org.springframework.stereotype.Repository; /** * @Description : 对象持久层仓用方法控制 * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-13 9:47 + * @Author : amy + * @CreateDate : 2018-11-06 9:47 * @Modify: **/ @Repository 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 b650433..790e366 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,8 +1,8 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; -import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice; import cn.estsh.i3plus.pojo.wms.bean.WareHouse; import cn.estsh.i3plus.pojo.wms.bean.WmsTrans; import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; @@ -46,18 +46,6 @@ public class WmsHqlPack { } /** - * 接口驱动类信息 分页查询 - * @return - */ - public static String packHqlInterfaceDevice(InterfaceDevice interfaceDevice){ - StringBuffer sb = new StringBuffer(); - //驱动类名称 - HqlPack.getStringEqualPack(interfaceDevice.getDeviceClassName(),"deviceClassName",sb); - - return null; - } - - /** * 元数据信息 分页查询 * @param wmsObject * @return @@ -122,4 +110,18 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 仓库分页查询条件 + * @param wareHouse + * @return + */ + public static String packHqlWareHouse(WareHouse wareHouse) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); + HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); + HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); + HqlPack.getStringEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()+"","isValid",result); + return result.toString(); + } }