I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

流程管家优化

Browse Source
yun-zuoyi
许心洁 6 years ago
parent db3d47cd6e
commit 98041fe58d
12 changed files with 123 additions and 134 deletions
Show Stats Download Patch File Download Diff File

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java
Unescape Escape View File

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLogData;
/**
* @Description : 作业日志参数(使用Mongodb)
* @Reference :
* @Author : siliter
* @Date : 2019-04-11 12:03:00
* @Modify :
**/
public interface WmsActionLogDataMongoRepository extends BaseMongoRepository<WmsActionLogData, Long> {
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java
Unescape Escape View File

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLogDetails;
/**
* @Description : 作业日志明细(使用Mongodb)
* @Reference :
* @Author : siliter
* @Date : 2019-04-11 12:03:00
* @Modify :
**/
public interface WmsActionLogDetailsMongoRepository extends BaseMongoRepository<WmsActionLogDetails, Long> {
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java
Unescape Escape View File

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLog;
/**
* @Description : 作业日志(使用Mongodb)
* @Reference :
* @Author : siliter
* @Date : 2019-04-11 12:03:00
* @Modify :
**/
public interface WmsActionLogMongoRepository extends BaseMongoRepository<WmsActionLog, Long> {
}

80
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java
Unescape Escape View File

@ -1,80 +0,0 @@
package cn.estsh.i3plus.pojo.platform.sqlpack;
import cn.estsh.i3plus.pojo.base.tool.BsonPackTool;
import cn.estsh.i3plus.pojo.platform.platbean.*;
import com.mongodb.BasicDBObject;
import org.bson.conversions.Bson;
/**
* @Description : Bson对象封装
* @Reference :
* @Author : siliter
* @CreateDate : 2019-04-11 13:15
* @Modify:
**/
public class WmsBsonPack {
/**
* 作业日志复杂查询
*
* @param actionLog
* @return
*/
public static Bson packBsonByActionLog(WmsActionLog actionLog) {
Bson bson = new BasicDBObject();
bson = BsonPackTool.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", bson, false, false);
bson = BsonPackTool.getStringEqualPack(actionLog.getOrderNo(), "orderNo", bson);
bson = BsonPackTool.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", bson);
bson = BsonPackTool.getStringEqualPack(actionLog.getFixId(), "fixId", bson);
bson = BsonPackTool.getNumEqualPack(actionLog.getAgId(), "agId", bson);
bson = BsonPackTool.getNumEqualPack(actionLog.getActionStatus(), "actionStatus", bson);
bson = BsonPackTool.getStringEqualPack(actionLog.getAgNameC(), "agNameC", bson);
bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson);
bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson);
bson = BsonPackTool.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", bson);
if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="")
|| (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){
bson = BsonPackTool.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", bson, true);
}
if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "")
|| (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){
bson = BsonPackTool.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", bson, true);
}
return bson;
}
/**
* 作业日志明细复杂查询
*
* @param actionLogDetails
* @return
*/
public static Bson packBsonByActionLogDetails(WmsActionLogDetails actionLogDetails) {
Bson bson = new BasicDBObject();
bson = BsonPackTool.getNumEqualPack(actionLogDetails.getAlId(), "alId", bson);
bson = BsonPackTool.getStringEqualPack(actionLogDetails.getOrganizeCode(), "organizeCode", bson);
bson = BsonPackTool.getNumEqualPack(actionLogDetails.getValueType(), "valueType", bson);
bson = BsonPackTool.getNumEqualPack(actionLogDetails.getSeq(), "seq", bson);
bson = BsonPackTool.getNumEqualPack(actionLogDetails.getIsValid(), "isValid", bson);
bson = BsonPackTool.getNumEqualPack(actionLogDetails.getIsDeleted(), "isDeleted", bson);
return bson;
}
/**
* 调用组件日志复杂查询
*
* @param actionLogData
* @return
*/
public static Bson packBsonByActionLogData(WmsActionLogData actionLogData) {
Bson bson = new BasicDBObject();
bson = BsonPackTool.getNumEqualPack(actionLogData.getAldId(), "aldId", bson);
bson = BsonPackTool.getStringEqualPack(actionLogData.getOrganizeCode(), "organizeCode", bson);
bson = BsonPackTool.getNumEqualPack(actionLogData.getIsValid(), "isValid", bson);
bson = BsonPackTool.getNumEqualPack(actionLogData.getIsDeleted(), "isDeleted", bson);
return bson;
}
}

10
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java → modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java
Unescape Escape View File

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.platform.platbean;
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -50,7 +50,7 @@ public class WmsActionLog extends BaseBean {
@ApiParam(value = "交易类型编号")
public String transTypeCode;
@Transient
@Column(name="TRANS_TYPE_NAME")
@ApiParam(value = "交易类型名称")
public String transTypeName;
@ -68,9 +68,9 @@ public class WmsActionLog extends BaseBean {
}
}
@Column(name="AG_NAME_C")
@ApiParam(value = "作业流程名称")
public String agNameC;
@Column(name = "AL_NAME_RDD")
@ApiParam(value = "流程名称")
public String agNameRdd;
@Column(name="ACTION_USER_NAME")
@ApiParam(value = "作业人员")

3
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java → modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java
Unescape Escape View File

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.platform.platbean;
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -10,7 +10,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;

7
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java → modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java
Unescape Escape View File

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.platform.platbean;
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :作业记录明细表
@ -36,9 +35,9 @@ public class WmsActionLogDetails extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
public Long alId;
@Transient
@Column(name = "AL_NAME_RDD")
@ApiParam(value = "流程名称")
public String agNameC;
public String agNameRdd;
@Column(name = "SEQ")
@ApiParam(value = "序号", example = "1")

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java
Unescape Escape View File

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -35,6 +34,7 @@ public class WmsActionStepCallParam extends BaseBean {
@Column(name = "AGD_ID")
@ApiParam(value = "流程明细编号")
@JsonSerialize(using = ToStringSerializer.class)
private Long agdId;
@Column(name = "SEQ")

14
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java
Unescape Escape View File

@ -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.WmsActionLogData;
/**
* @Description : 作业日志参数(使用Mongodb)
* @Reference :
* @Author : siliter
* @Date : 2019-04-11 12:03:00
* @Modify :
**/
public interface WmsActionLogDataRepository extends BaseRepository<WmsActionLogData, Long> {
}

14
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java
Unescape Escape View File

@ -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.WmsActionLogDetails;
/**
* @Description : 作业日志明细(使用Mongodb)
* @Reference :
* @Author : siliter
* @Date : 2019-04-11 12:03:00
* @Modify :
**/
public interface WmsActionLogDetailsRepository extends BaseRepository<WmsActionLogDetails, Long> {
}

14
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java
Unescape Escape View File

@ -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.WmsActionLog;
/**
* @Description : 作业日志(使用Mongodb)
* @Reference :
* @Author : siliter
* @Date : 2019-04-11 12:03:00
* @Modify :
**/
public interface WmsActionLogRepository extends BaseRepository<WmsActionLog, Long> {
}

71
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -2159,4 +2159,75 @@ public class WmsHqlPack {
return result;
}
/******************************************作业记录日志HQLPACK开始************************************************/
/**
* 作业日志复杂查询
*
* @param actionLog
* @return
*/
public static DdlPackBean packHqlWmsActionLogByActionLog(WmsActionLog actionLog) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", packBean, false, false);
DdlPreparedPack.getStringEqualPack(actionLog.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", packBean);
DdlPreparedPack.getStringEqualPack(actionLog.getFixId(), "fixId", packBean);
DdlPreparedPack.getNumEqualPack(actionLog.getAgId(), "agId", packBean);
DdlPreparedPack.getNumEqualPack(actionLog.getActionStatus(), "actionStatus", packBean);
DdlPreparedPack.getStringEqualPack(actionLog.getAgNameRdd(), "agNameRdd", packBean);
DdlPreparedPack.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(actionLog.getIsValid(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", packBean);
if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="")
|| (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){
DdlPreparedPack.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", packBean, true);
}
if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "")
|| (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){
DdlPreparedPack.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", packBean, true);
}
return packBean;
}
/**
* 作业日志明细复杂查询
*
* @param actionLogDetails
* @return
*/
public static DdlPackBean packHqlWmsActionLogByActionLogDetails(WmsActionLogDetails actionLogDetails) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(actionLogDetails.getAlId(), "alId", packBean);
DdlPreparedPack.getStringEqualPack(actionLogDetails.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(actionLogDetails.getValueType(), "valueType", packBean);
DdlPreparedPack.getNumEqualPack(actionLogDetails.getSeq(), "seq", packBean);
DdlPreparedPack.getNumEqualPack(actionLogDetails.getIsValid(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(actionLogDetails.getIsDeleted(), "isDeleted", packBean);
return packBean;
}
/**
* 调用组件日志复杂查询
*
* @param actionLogData
* @return
*/
public static DdlPackBean packHqlWmsActionLogByActionLogData(WmsActionLogData actionLogData) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(actionLogData.getAldId(), "aldId", packBean);
DdlPreparedPack.getStringEqualPack(actionLogData.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(actionLogData.getIsValid(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(actionLogData.getIsDeleted(), "isDeleted", packBean);
return packBean;
}
/******************************************作业记录日志HQLPACK结束************************************************/
}

Write Preview
Loading…
Cancel
Save