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

Merge branch 'dev' into test

Browse Source
yun-zuoyi
peter.pan 6 years ago
parent 739f12657e 5a7ce32761
commit 8f977719c0
20 changed files with 294 additions and 155 deletions
Show Stats Download Patch File Download Diff File

4
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java
Unescape Escape View File

@ -15,6 +15,7 @@ import java.lang.reflect.Field;
/**
* @Description : Xml 工厂
* 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-7-23 下午5:58
@ -58,6 +59,9 @@ public class XStreamFactory {
};
}
});
xStream.autodetectAnnotations(true);
return xStream;
}

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -2701,7 +2701,7 @@ public class WmsEnumUtil {
ZMMES("ZMMES", "知明MES"),
TBMES("TBMES", "MES接口"),
AMP("AMP", "AMP系统"),
ZSLD("ZSLD", "直送拉动");
DR("DR", "直送拉动");
private String value;
private String description;

42
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java
Unescape Escape View File

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.model.softswitch;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-7-25 下午3:31
* @Modify:
**/
@Data
@XStreamAlias("auth")
public class PojoAuth{
@XStreamAsAttribute
private Long id;
@XStreamAsAttribute
private Integer authType;
@XStreamImplicit
private List<Prop> params;
private String authPath;
private String userName ="登录名称";
private String password ="登录名称";
private String languageCode ="登录名称";
private String token ="登录名称";
public PojoAuth(Long id, Integer authType,String authPath, List<Prop> params) {
this.id = id;
this.authType = authType;
this.authPath = authPath;
this.params = params;
}
}

28
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java
Unescape Escape View File

@ -0,0 +1,28 @@
package cn.estsh.i3plus.pojo.model.softswitch;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-7-25 下午5:18
* @Modify:
**/
@Data
@XStreamAlias("prop")
public class Prop {
@XStreamAsAttribute
private Long id;
private String paramName;
private String paramValue;
public Prop(Long id, String paramName, String paramValue) {
this.id = id;
this.paramName = paramName;
this.paramValue = paramValue;
}
}

29
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java
Unescape Escape View File

@ -0,0 +1,29 @@
package cn.estsh.i3plus.pojo.model.softswitch;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-7-25 下午3:31
* @Modify:
**/
@Data
@XStreamAlias("request")
public class Request{
@XStreamAsAttribute
private Long id;
@XStreamAsAttribute
private Integer requestType;
private String requestPath;
public Request(Long id, Integer requestType,String requestPath) {
this.id = id;
this.requestType = requestType;
this.requestPath = requestPath;
}
}

39
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/XmlModel.java
Unescape Escape View File

@ -0,0 +1,39 @@
package cn.estsh.i3plus.pojo.model.softswitch;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-7-25 下午3:29
* @Modify:
**/
@Data
@XStreamAlias("model")
public class XmlModel {
@XStreamAsAttribute
private Long id;
@XStreamAsAttribute
private Integer caseType;
private String suitCaseStatus;
private String key;
private PojoAuth auth;
private Request request;
public XmlModel(Long id, Integer caseType,String suitCaseStatus, String key, PojoAuth auth,Request request) {
this.id = id;
this.caseType = caseType;
this.suitCaseStatus = suitCaseStatus;
this.key = key;
this.auth = auth;
this.request = request;
}
}

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java
Unescape Escape View File

@ -4,7 +4,6 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description : 操作人对象，用于登陆，非持久化

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")

13
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java
Unescape Escape View File

@ -103,4 +103,17 @@ public class WmsInterfaceDataMapper extends BaseBean {
*/
@Column(name = "BUSI_ROUTE")
public String busiRoute;
/**
* 同步频率
*/
@Column(name = "SYNC_FREQUENCY")
public int syncFrequency;
/**
* 上次同步时间
*/
@Column(name = "LAST_SYNC_TIME")
public String lastSyncTime;
}

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> {
}

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

@ -74,8 +74,8 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanTime(), "planTime", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanDate(), "planDate", result);
@ -95,9 +95,9 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result);
@ -139,7 +139,6 @@ public class WmsHqlPack {
DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
getStringBuilderPack(wmsDocMovementMaster, packBean);
@ -182,7 +181,7 @@ public class WmsHqlPack {
DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(),
WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue()}, "poStatus", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
@ -702,9 +701,9 @@ public class WmsHqlPack {
// 来源单据类型
DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result);
// 来源单据号
DdlPreparedPack.getStringLikerPack(wmsSnPrint.getRefNo(), "refNo", result);
DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result);
// 打印机
DdlPreparedPack.getStringLikerPack(wmsSnPrint.getPrinter(), "printer", result);
DdlPreparedPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result);
// 打印机状态
DdlPreparedPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result);
@ -838,7 +837,6 @@ public class WmsHqlPack {
WmsEnumUtil.STOCK_SN_STATUS.COMMING.getValue()}, "snStatus", result);
}
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
result.setWhereAppend(result.getWhereAppend() + " and qty > 0");
getStringBuilderPack(wmsStockSn, result);
@ -894,7 +892,7 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringLikerPack(wmsTransQuan.getMoveNo(), "moveNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
@ -965,8 +963,8 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
DdlPreparedPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
getStringBuilderPack(wmsPackage, result);
@ -1002,11 +1000,11 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result);
DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getCreateUser(), "createUser", result);
DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(),
wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
@ -1102,13 +1100,13 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//单号
DdlPreparedPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
//业务类型
DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
//关联单据类型
DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
//关联单据号
DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result);
DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
getStringBuilderPack(wmsQCMaster, result);
@ -1729,10 +1727,10 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) {
DdlPackBean packBean = new DdlPackBean();
if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) {
DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmName(), "tmName", packBean);
DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", packBean);
}
if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) {
DdlPreparedPack.getStringLikerPack(wmsTransModule.getCallClass(), "callClass", packBean);
DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", packBean);
}
if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) {
DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean);
@ -2179,6 +2177,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