Administrator 7 years ago
commit cc497e8a02

@ -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

@ -80,7 +80,7 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
* in
* @param ids
*/
public void deleteByIdIn(long[] ids);
public void deleteByIds(long[] ids);
/**
*

@ -65,12 +65,12 @@ public class BaseRepositoryImpl<T, ID extends Serializable> 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<T, ID extends Serializable> 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);
@ -144,9 +144,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> 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() + " 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<T, ID extends Serializable> 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<T, ID extends Serializable> 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] + ",");
}

@ -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 ");
}
}
/**
* longintlike
* @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 + "%'");
}
}
/**
* Stringlike
* @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 + "%'");
}
}
/**
* Stringlike()
* @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 + "%'");
}
}
/**
* Stringlike()
* @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 + "'");
}
}
}

@ -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<SysMenu> childList;

@ -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();
}
}

@ -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;
}
}
}

@ -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;
}
}
}

@ -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;
}
Loading…
Cancel
Save