From 98041fe58da0f78b46b7a37b87723023d2a5769b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 22 Jul 2019 17:32:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsActionLogDataMongoRepository.java | 14 ---- .../WmsActionLogDetailsMongoRepository.java | 14 ---- .../WmsActionLogMongoRepository.java | 14 ---- .../i3plus/pojo/platform/sqlpack/WmsBsonPack.java | 80 ---------------------- .../estsh/i3plus/pojo/wms/bean}/WmsActionLog.java | 10 +-- .../i3plus/pojo/wms/bean}/WmsActionLogData.java | 3 +- .../i3plus/pojo/wms/bean}/WmsActionLogDetails.java | 7 +- .../pojo/wms/bean/WmsActionStepCallParam.java | 2 +- .../wms/repository/WmsActionLogDataRepository.java | 14 ++++ .../repository/WmsActionLogDetailsRepository.java | 14 ++++ .../wms/repository/WmsActionLogRepository.java | 14 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 71 +++++++++++++++++++ 12 files changed, 123 insertions(+), 134 deletions(-) delete mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java delete mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java delete mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java delete mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java rename modules/{i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean => i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean}/WmsActionLog.java (96%) rename modules/{i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean => i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean}/WmsActionLogData.java (96%) rename modules/{i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean => i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean}/WmsActionLogDetails.java (96%) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java deleted file mode 100644 index 61e25a7..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java +++ /dev/null @@ -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 { -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java deleted file mode 100644 index a87ced1..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java +++ /dev/null @@ -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 { -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java deleted file mode 100644 index 873ae06..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java +++ /dev/null @@ -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 { -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java deleted file mode 100644 index f4c744c..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java +++ /dev/null @@ -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; - } -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java similarity index 96% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java index b498c26..dffe9b6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java @@ -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 = "作业人员") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java similarity index 96% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java index 8a426ea..e507653 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java @@ -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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java similarity index 96% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index dd19abb..f6cc610 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -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") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java index ffe7a9e..778a86d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java @@ -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") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java new file mode 100644 index 0000000..5bba3e4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.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.WmsActionLogData; + +/** + * @Description : 作业日志参数(使用Mongodb) + * @Reference : + * @Author : siliter + * @Date : 2019-04-11 12:03:00 + * @Modify : + **/ +public interface WmsActionLogDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java new file mode 100644 index 0000000..8c12573 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.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.WmsActionLogDetails; + +/** + * @Description : 作业日志明细(使用Mongodb) + * @Reference : + * @Author : siliter + * @Date : 2019-04-11 12:03:00 + * @Modify : + **/ +public interface WmsActionLogDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java new file mode 100644 index 0000000..8d96656 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.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.WmsActionLog; + +/** + * @Description : 作业日志(使用Mongodb) + * @Reference : + * @Author : siliter + * @Date : 2019-04-11 12:03:00 + * @Modify : + **/ +public interface WmsActionLogRepository 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 60044b8..fe35285 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 @@ -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结束************************************************/ + } From 00fc0de4a99e65cde0c7b0b1d8e3a005579f84e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 23 Jul 2019 13:17:44 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 9b72e6f..9be97bc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -23,6 +23,9 @@ public class SessionUser implements Serializable { @ApiParam("用户ID") private Long userId; + @ApiParam("设备ID") + private String deviceId; + @ApiParam("用户工号") private String userCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java index 362093a..b092690 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java @@ -36,7 +36,7 @@ public class WmsPackSn extends BaseBean { @ApiParam(value = "物料编码") private String partNo; - @Column(name = "PART_NAME") + @Column(name = "PART_NAME_ADD") @ApiParam(value = "物料名称") private String partNameAdd; From 1de613a09cd1ca073c69faf67d02fe925e791b38 Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Fri, 26 Jul 2019 10:35:29 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=A2=91=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index f526946..889fa6a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -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; + } From b5c204f873ed2302b925ffcd38be1ec41269c399 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 26 Jul 2019 11:10:28 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=88=B6=E4=BD=9C=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/common/XStreamFactory.java | 4 +++ .../i3plus/pojo/model/softswitch/PojoAuth.java | 42 ++++++++++++++++++++++ .../estsh/i3plus/pojo/model/softswitch/Prop.java | 28 +++++++++++++++ .../i3plus/pojo/model/softswitch/Request.java | 29 +++++++++++++++ .../i3plus/pojo/model/softswitch/XmlModel.java | 39 ++++++++++++++++++++ 5 files changed, 142 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/XmlModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index 8709cb6..76e17ee 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -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; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java new file mode 100644 index 0000000..d832b1d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java @@ -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 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 params) { + this.id = id; + this.authType = authType; + this.authPath = authPath; + this.params = params; + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java new file mode 100644 index 0000000..248ccd5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java @@ -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; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java new file mode 100644 index 0000000..11b2bb1 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java @@ -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; + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/XmlModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/XmlModel.java new file mode 100644 index 0000000..6afb378 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/XmlModel.java @@ -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; + } +} + + + From 5a7ce327615fd0737bd1ac4a31409b4205903dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 26 Jul 2019 13:15:25 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 4a79b7c..8ad590e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -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;