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 01/25] =?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 02/25] =?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 2aa1e9811e251017569864bb118763204ae76c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 24 Jul 2019 14:12:39 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java index 615269b..2e4b9bd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java @@ -40,7 +40,7 @@ public class WmsUnitConvert extends BaseBean { @ApiParam(value = "换算率") private Double unitCoefficient; - public Double getUnitCoefficient() { + public Double getUnitCoefficientVal() { return this.unitCoefficient == null ? 0 : this.unitCoefficient.doubleValue(); } } From cf33f70e3101c92dfa4fe528b6746a16fe6a358c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 24 Jul 2019 16:49:09 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index ebf60a2..ad849e5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -154,11 +154,5 @@ public class WmsMoveMaster extends BaseBean { this.transQty = transQty; this.rejectQty = rejectQty; this.fixId = fixId; - } - - - - - } From f8fd8dbab0563aca7f043123a58befc6c56491a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 24 Jul 2019 19:40:02 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java index 853d848..645df63 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java @@ -46,6 +46,6 @@ public class WmsSapOrderLock extends BaseBean { @Column(name = "IS_SYNC") @ApiParam("同步标识") - public Integer isSync = 10; + public Integer isSync = 2; } From c4db15db9b64ad5d248dc45460661d67fe81832e Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 24 Jul 2019 20:30:20 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20XStream=20=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 4 + .../i3plus/pojo/base/annotation/XStreamCDATA.java | 18 ++ .../i3plus/pojo/base/common/XStreamFactory.java | 236 +++++++++++++++++++++ pom.xml | 5 + 4 files changed, 263 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/XStreamCDATA.java create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 888e1bd..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -35,6 +35,10 @@ com.alibaba fastjson + + com.thoughtworks.xstream + xstream + diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/XStreamCDATA.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/XStreamCDATA.java new file mode 100644 index 0000000..9ade29e --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/XStreamCDATA.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.base.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @Description : XStream 数据转换的CDATA + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019-07-23 下午5:52 + * @Modify: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface XStreamCDATA { +} 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 new file mode 100644 index 0000000..6787a28 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -0,0 +1,236 @@ +package cn.estsh.i3plus.pojo.base.common; + +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +import com.alibaba.fastjson.JSON; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import com.thoughtworks.xstream.core.util.QuickWriter; +import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import com.thoughtworks.xstream.io.naming.NameCoder; +import com.thoughtworks.xstream.io.naming.NoNameCoder; +import com.thoughtworks.xstream.io.xml.DomDriver; +import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; +import com.thoughtworks.xstream.io.xml.XppDomDriver; +import lombok.Data; +import sun.plugin2.util.SystemUtil; + +import java.io.Serializable; +import java.io.Writer; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + * @Description : Xml 工厂 + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-7-23 下午5:58 + * @Modify: + **/ +public class XStreamFactory { + + private static final XStream xStream = XStreamFactory.getXStream(); + + public static final String CDATA_PREFIX = ""; + + public static XStream getXStream() { + final NameCoder nameCoder = new NoNameCoder(); + XStream xStream = new XStream(new XppDomDriver(nameCoder) { + @Override + public HierarchicalStreamWriter createWriter(Writer out) { + return new PrettyPrintWriter(out, nameCoder) { + boolean cdataFlag = false; + Class targetClass = null; + + @Override + public void startNode(String name, Class clazz) { + super.startNode(name, clazz); + if (targetClass == null) { + targetClass = clazz; + } + cdataFlag = isCDATA(targetClass, name); + } + + @Override + public void writeText(QuickWriter writer, String text) { + if (cdataFlag) { + writer.write(CDATA_PREFIX); + writer.write(text); + writer.write(CDATA_SUFFIX); + } else { + writer.write(text); + } + } + }; + } + }); + return xStream; + } + + + private static boolean isCDATA(Class clazz, String fieldAlias) { + //检查类本身 + boolean cdataFlag = isExistCDATA(clazz, fieldAlias); + if (cdataFlag) { + return cdataFlag; + } + //继续检查父类 + Class superClazz = clazz.getSuperclass(); + while (!superClazz.equals(Object.class)) { + cdataFlag = isExistCDATA(superClazz, fieldAlias); + if (cdataFlag) { + return cdataFlag; + } + superClazz = superClazz.getClass().getSuperclass(); + } + return false; + } + + /** + * 检查是否有 @XStreamCDATA 注解 + * + * @param clazz clazz + * @param fieldAlias fieldAlias + * @return + */ + private static boolean isExistCDATA(Class clazz, String fieldAlias) { + Field[] fields = clazz.getDeclaredFields(); + for (Field field : fields) { + if (field.getAnnotation(XStreamCDATA.class) != null) { + XStreamAlias xStreamAlias = field.getAnnotation(XStreamAlias.class); + if (xStreamAlias != null && fieldAlias.equals(xStreamAlias.value())) { + return true; + } else { + if (fieldAlias.equals(field.getName())) { + return true; + } + } + } + } + return false; + } + + + + /** + * Javabean 转XML + * @param + * @return xml字符串 + */ + public static String toXml(T t) { + xStream.processAnnotations(t.getClass()); + String headLine = "\n"; + return headLine + xStream.toXML(t); + } + + /** + * XML字符串转javabean + * + * @param xmlStr xml字符串 + * @param + * @return Java对象 + */ + public static T toJavaBean(String xmlStr) { + return (T) xStream.fromXML(xmlStr); + } +// +// public static void main(String[] args) { +// User u = new User(0, "zhangsan0", "zhangsanpwd0"); +// User u1 = new User(1, "zhangsan1", "zhangsanpwd"); +// User u2 = new User(2, "zhangsan2", "zhangsanpwd"); +// User u3 = new User(3, "zhangsan3", "zhangsanpwd"); +// +// Role r1 = new Role(1, "Admin", "Admin1"); +// Role r2 = new Role(2, "Admin", "Admin2"); +// Role r3 = new Role(3, "Admin", "Admin3"); +// +// DataAdapter ad = new DataAdapter(10086L,UUID.randomUUID().toString(),"sssfwef",u1); +// u1.setRole(r1); +// +// u2.getRoleList().add(r1); +// u2.getRoleList().add(r2); +// u2.getRoleList().add(r3); +// +// u3.setRole(r1); +// u3.getRoleList().add(r2); +// u3.getRoleList().add(r3); +// +// System.out.println(toXml(u) + "\n\n "); +// System.out.println(toXml(u1) + "\n\n "); +// System.out.println(toXml(u2) + "\n\n "); +// System.out.println(toXml(u3) + "\n\n "); +// System.out.println(toXml(ad) + "\n\n "); +// +// System.out.println(JSON.toJSONString(toJavaBean(toXml(ad)))); +// +// } +} +// +//@Data +//@XStreamAlias("DataAdapter") +////对应carInfos元素 +//class DataAdapter implements Serializable { +// +// @XStreamAsAttribute +// private Long scId; +// private String key; +// @XStreamCDATA +// private String resultData; +// +// private Object auth; +// +// public DataAdapter(Long scId, String key, String resultData, Object auth) { +// this.scId = scId; +// this.key = key; +// this.resultData = resultData; +// this.auth = auth; +// } +//} +// +//@Data +//@XStreamAlias("user") +////对应carInfos元素 +//class User implements Serializable { +// private static final long serialVersionUID = -7554548655397869156L; +// +// @XStreamAsAttribute +// private Integer id; +// private String loginName; +// private String loginPwd; +// +// private Role role; +// private List roleList = new ArrayList(); +// private List roleArray; +// +// public User() { +// } +// +// public User(Integer id, String loginName, String loginPwd) { +// this.id = id; +// this.loginName = loginName; +// this.loginPwd = loginPwd; +// } +//} +// +//@Data +//@XStreamAlias("role") +////对应carInfos元素 +//class Role implements Serializable { +// private static final long serialVersionUID = -3134157833696958743L; +// @XStreamAsAttribute +// private Integer id; +// private String roleName; +// private String roleCode; +// +// public Role() { +// } +// +// public Role(Integer id, String roleName, String roleCode) { +// this.id = id; +// this.roleName = roleName; +// this.roleCode = roleCode; +// } +//} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8975679..6c327d0 100644 --- a/pom.xml +++ b/pom.xml @@ -150,6 +150,11 @@ fastjson 1.2.49 + + com.thoughtworks.xstream + xstream + 1.4.11.1 + From 90439f55fd6a26f79b81dc927e70ddbdfb906b75 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 24 Jul 2019 20:33:15 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20XStream=20=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java | 9 --------- 1 file changed, 9 deletions(-) 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 6787a28..8709cb6 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 @@ -1,26 +1,17 @@ package cn.estsh.i3plus.pojo.base.common; import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; -import com.alibaba.fastjson.JSON; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.core.util.QuickWriter; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.io.naming.NameCoder; import com.thoughtworks.xstream.io.naming.NoNameCoder; -import com.thoughtworks.xstream.io.xml.DomDriver; import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; import com.thoughtworks.xstream.io.xml.XppDomDriver; -import lombok.Data; -import sun.plugin2.util.SystemUtil; -import java.io.Serializable; import java.io.Writer; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; /** * @Description : Xml 工厂 From df49ab097b9965fdd50b089f70a07ef683ceedbb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 25 Jul 2019 09:16:47 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E8=B5=8B=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E2=80=9C=E5=BE=85=E5=90=8C=E6=AD=A5=E2=80=9D=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java index 645df63..5e11bd4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java @@ -46,6 +46,6 @@ public class WmsSapOrderLock extends BaseBean { @Column(name = "IS_SYNC") @ApiParam("同步标识") - public Integer isSync = 2; + public Integer isSync = 1; } From 07008f8e1be2e7beabd30e69c019cc06878abe4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 25 Jul 2019 16:00:29 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java index 66fd04c..aa4d0b8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java @@ -61,14 +61,11 @@ public class SapBase { private String guid = UUID.randomUUID().toString(); public String getSynymdTime() { - SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-DD"); - //format.format(new Date()) - return ""; + return (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); } public String getSynhmsTime() { SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss"); - //format.format(new Date()) - return ""; + return format.format(new Date()); } } From 1de613a09cd1ca073c69faf67d02fe925e791b38 Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Fri, 26 Jul 2019 10:35:29 +0800 Subject: [PATCH 10/25] =?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 11/25] =?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 0a78cf4ec53be2d07871326e45ab8d01fce0cf67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 26 Jul 2019 12:51:18 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=96=B0=E5=A2=9Eget?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 314e492..1afc6f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -156,4 +156,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("差异") private Double difference; + public Double getSnpVal() { + return snp; + } } 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 13/25] =?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; From e09ad49fc9e2f67a06ee86ae515a290ddd03898d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 26 Jul 2019 14:22:57 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E4=BE=9B=E5=BA=94=E5=95=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index ee682ea..c78fa6e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -138,6 +138,10 @@ public class WmsPart extends BaseBean { @ApiParam("结算方式") private String outCloseType; + @Column(name = "OUT_CLOSE_VENDOR") + @ApiParam("结算供应商") + private String outCloseVendor; + @Transient @ApiParam("总数量") private Double qty; From a7144e3a1fbd3c252f1a30243ee15aa00c2801e3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 26 Jul 2019 14:39:59 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=A0=87=E8=AF=86=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java index 5e11bd4..645df63 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java @@ -46,6 +46,6 @@ public class WmsSapOrderLock extends BaseBean { @Column(name = "IS_SYNC") @ApiParam("同步标识") - public Integer isSync = 1; + public Integer isSync = 2; } From 4bad223c0d16b49e5f3d21394dda391446ab376c 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 16:05:56 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E7=9B=B4=E9=80=81=E5=8F=91=E8=BF=90JOB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 33 +++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) 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 edc6101..6f65d60 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 @@ -49,9 +49,10 @@ public class WmsHqlPack { /** * 单位换算 分页查询 + * * @return */ - public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){ + public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert) { DdlPackBean result = new DdlPackBean(); //查询参数封装 @@ -1470,12 +1471,11 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); - DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zones", result); + DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result); - if (StringUtils.isNotBlank(wmsStockSn.getOrderByParam())) { - result.setOrderByStr(wmsStockSn.getOrderByParam()); - } + result.setOrderByStr(wmsStockSn.orderBy()); + getStringBuilderPack(wmsStockSn, result); return result; } @@ -2178,7 +2178,6 @@ public class WmsHqlPack { } - /******************************************作业记录日志HQLPACK开始************************************************/ /** * 作业日志复杂查询 @@ -2199,13 +2198,13 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(actionLog.getIsValid(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", packBean); - if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="") - || (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){ + 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() != "")){ + if ((actionLog.getEndTimeStart() != null && actionLog.getEndTimeStart() != "") + || (actionLog.getEndTimeEnd() != null && actionLog.getEndTimeEnd() != "")) { DdlPreparedPack.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", packBean, true); } @@ -2264,19 +2263,19 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); // 库位不为空 - DdlPreparedPack.getStringNotNullPack( "locateNo", result); - DdlPreparedPack.getStringNoEqualPack("","locateNo", result); + DdlPreparedPack.getStringNotNullPack("locateNo", result); + DdlPreparedPack.getStringNoEqualPack("", "locateNo", result); // 排除创建及出库状态条码 - if(wmsStockSn.getSnStatus() != null){ + if (wmsStockSn.getSnStatus() != null) { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); } - DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result); - DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result); + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(), "snStatus", result); + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(), "snStatus", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); //数量大于0 - DdlPreparedPack.getNumberBiggerPack(0,"qty",result); + DdlPreparedPack.getNumberBiggerPack(0, "qty", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); From c3fe273954628ce39bd17cf029d2fb5d2dafe58f Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 29 Jul 2019 10:07:37 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 125 +++++++++++---------- 1 file changed, 63 insertions(+), 62 deletions(-) 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 6f65d60..fafda69 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 @@ -49,10 +49,9 @@ public class WmsHqlPack { /** * 单位换算 分页查询 - * * @return */ - public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert) { + public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){ DdlPackBean result = new DdlPackBean(); //查询参数封装 @@ -75,8 +74,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); @@ -96,9 +95,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); - DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); @@ -140,6 +139,7 @@ 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 +182,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.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); @@ -702,9 +702,9 @@ public class WmsHqlPack { // 来源单据类型 DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result); // 来源单据号 - DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result); + DdlPreparedPack.getStringLikerPack(wmsSnPrint.getRefNo(), "refNo", result); // 打印机 - DdlPreparedPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result); + DdlPreparedPack.getStringLikerPack(wmsSnPrint.getPrinter(), "printer", result); // 打印机状态 DdlPreparedPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result); @@ -838,6 +838,7 @@ 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); @@ -893,7 +894,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); - DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); + DdlPreparedPack.getStringLikerPack(wmsTransQuan.getMoveNo(), "moveNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); @@ -964,8 +965,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result); - DdlPreparedPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); + DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); getStringBuilderPack(wmsPackage, result); @@ -1001,11 +1002,11 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); - DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getCreateUser(), "createUser", result); - DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); + DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result); + DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(), wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true); @@ -1101,13 +1102,13 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //单号 - DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result); //业务类型 DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); //关联单据类型 DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); //关联单据号 - DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); + DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result); getStringBuilderPack(wmsQCMaster, result); @@ -1727,10 +1728,10 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) { DdlPackBean packBean = new DdlPackBean(); if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) { - DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", packBean); + DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmName(), "tmName", packBean); } if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) { - DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", packBean); + DdlPreparedPack.getStringLikerPack(wmsTransModule.getCallClass(), "callClass", packBean); } if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean); @@ -2177,6 +2178,45 @@ public class WmsHqlPack { return result; } + /** + * 库存条码管理查询条件 + * + * @param wmsStockSn + * @return + */ + public static DdlPackBean packHqlWmsStockSnManageByPager(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + + // 物料编码支持多选 + DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + // 存储区 + DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + + DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + // 库位不为空 + DdlPreparedPack.getStringNotNullPack( "locateNo", result); + DdlPreparedPack.getStringNoEqualPack("","locateNo", result); + // 排除创建及出库状态条码 + if(wmsStockSn.getSnStatus() != null){ + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + } + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result); + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result); + + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result); + + //数量大于0 + DdlPreparedPack.getNumberBiggerPack(0,"qty",result); + DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + + getStringBuilderPack(wmsStockSn, result); + return result; + } /******************************************作业记录日志HQLPACK开始************************************************/ /** @@ -2198,13 +2238,13 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(actionLog.getIsValid(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", packBean); - if ((actionLog.getStartTimeStart() != null && actionLog.getStartTimeStart() != "") - || (actionLog.getStartTimeEnd() != null && actionLog.getStartTimeEnd() != "")) { + 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() != "")) { + if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "") + || (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){ DdlPreparedPack.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", packBean, true); } @@ -2245,43 +2285,4 @@ public class WmsHqlPack { /******************************************作业记录日志HQLPACK结束************************************************/ - /** - * 库存条码管理查询条件 - * - * @param wmsStockSn - * @return - */ - public static DdlPackBean packHqlWmsStockSnManageByPager(WmsStockSn wmsStockSn) { - DdlPackBean result = new DdlPackBean(); - - // 物料编码支持多选 - DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result); - DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); - DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); - // 存储区 - DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); - - DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); - // 库位不为空 - DdlPreparedPack.getStringNotNullPack("locateNo", result); - DdlPreparedPack.getStringNoEqualPack("", "locateNo", result); - // 排除创建及出库状态条码 - if (wmsStockSn.getSnStatus() != null) { - DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); - } - DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(), "snStatus", result); - DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(), "snStatus", result); - - DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); - - //数量大于0 - DdlPreparedPack.getNumberBiggerPack(0, "qty", result); - DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); - DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); - DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); - - getStringBuilderPack(wmsStockSn, result); - return result; - } } From c7571b4c66f043ca95107f6f9590595cccbcfa98 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 29 Jul 2019 13:16:54 +0800 Subject: [PATCH 18/25] =?UTF-8?q?IS=5FGENERAL=5FTASK=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=98=AF=E5=90=A6=E7=94=9F=E6=88=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81=20=E6=92=A4=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 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 8ad590e..8caa32b 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 @@ -766,7 +766,11 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum IS_GENERAL_TASK { - CREATE(10, "CREATE", "创建"), INIT(20, "INIT", "初始化"), IS_GENERAL(30, "IS_GENERAL", "已生成"), NO_GENERAL(40, "NO_GENERAL", "不生成"); + CREATE(10, "CREATE", "创建"), + INIT(20, "INIT", "初始化"), + IS_GENERAL(30, "IS_GENERAL", "已生成"), + NO_GENERAL(40, "NO_GENERAL", "不生成"), + CANCEL(50,"CANCEL","撤销"); private int value; private String code; From 17be4078be6199e4e98f777d52166b7cc18d97cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Mon, 29 Jul 2019 17:55:29 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java | 43 ++++++++++++++++++++++ .../pojo/wms/repository/WmsFixRepository.java | 16 ++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 19 ++++++++++ 3 files changed, 78 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFixRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java new file mode 100644 index 0000000..ee108bf --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java @@ -0,0 +1,43 @@ +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 lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; + +/** +* @Description : WMS_设备信息 +* @Reference : +* @author: amy.liu +* @date: 2019/7/29 10:39 +* @Modify: +*/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_FIX") +@Api("WMS设备信息") +public class WmsFix extends BaseBean{ + + @Column(name = "FIX_ID") + @ApiParam("设备编号") + public String fixId; + + @Column(name = "FIX_MAC") + @ApiParam("设备mac地址") + public String fixMac; + + @Column(name = "FIX_NAME") + @ApiParam("设备名称") + public String fixName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFixRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFixRepository.java new file mode 100644 index 0000000..57dca6a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFixRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsFix; +import org.springframework.stereotype.Repository; + +/** +* @Description : 设备 对象持久层仓用方法控制 +* @Reference : +* @author: amy.liu +* @date: 2019/7/29 10:44 +* @Modify: +*/ +@Repository +public interface WmsFixRepository 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 6f65d60..991f440 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 @@ -48,6 +48,25 @@ public class WmsHqlPack { } /** + * + * @param wmsFix + * @return + */ + public static DdlPackBean packHqlWmsFix(WmsFix wmsFix){ + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixId(), "fixId", result); + DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixMac(), "fixMac", result); + DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixName(), "fixName", result); + + getStringBuilderPack(wmsFix, result); + + return result; + } + + + /** * 单位换算 分页查询 * * @return From bda52f76c6a52a89049d91dfdabf5d175f384c74 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 29 Jul 2019 18:39:01 +0800 Subject: [PATCH 20/25] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=20Json=20?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E9=80=82=E9=85=8D=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 72 ++++++++++++++++++++++ .../i3plus/pojo/model/softswitch/PojoAuth.java | 10 ++- .../i3plus/pojo/model/softswitch/Request.java | 4 ++ .../{XmlModel.java => SuitCoreModel.java} | 13 ++-- .../pojo/softswitch/sqlpack/SoftswitchHqlPack.java | 2 +- 5 files changed, 95 insertions(+), 6 deletions(-) rename modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/{XmlModel.java => SuitCoreModel.java} (62%) 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 5e00634..5b16871 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 @@ -957,6 +957,78 @@ public class CommonEnumUtil { } } + /** + * HTTP 请求方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HTTP_METHOD_TYPE { + GET(1,"GET" ,"GET"), + POST(2, "POST","POST"), + DELETE(3, "DELETE","DELETE"), + PUT(4, "PUT","PUT"); + + private int value; + private String code; + private String description; + + private HTTP_METHOD_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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].code; + } + } + 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++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } // 数据有效的静态常量 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 index d832b1d..80e60a2 100644 --- 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamImplicit; @@ -31,7 +32,14 @@ public class PojoAuth{ private String userName ="登录名称"; private String password ="登录名称"; private String languageCode ="登录名称"; - private String token ="登录名称"; + + // 认证令牌 + private String token; +// // 认证令牌集合(复杂认证令牌) +// private List tokenList; + // 原始认证数据 + @XStreamCDATA + private String result; public PojoAuth(Long id, Integer authType,String authPath, List params) { this.id = id; 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 index 11b2bb1..87ac9f0 100644 --- 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import lombok.Data; @@ -21,6 +22,9 @@ public class Request{ private Integer requestType; private String requestPath; + @XStreamCDATA + private String result; + public Request(Long id, Integer requestType,String requestPath) { this.id = id; this.requestType = requestType; 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/SuitCoreModel.java similarity index 62% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/XmlModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java index 6afb378..38f205f 100644 --- 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/SuitCoreModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import lombok.Data; @@ -13,22 +14,26 @@ import lombok.Data; **/ @Data @XStreamAlias("model") -public class XmlModel { +public class SuitCoreModel { @XStreamAsAttribute private Long id; @XStreamAsAttribute private Integer caseType; - private String suitCaseStatus; + private String suitCaseStatusCode; + private String suitCaseMessage; private String key; private PojoAuth auth; private Request request; - public XmlModel(Long id, Integer caseType,String suitCaseStatus, String key, PojoAuth auth,Request request) { + @XStreamCDATA + private String responseResult; + + public SuitCoreModel(Long id, Integer caseType, String suitCaseStatusCode, String key, PojoAuth auth, Request request) { this.id = id; this.caseType = caseType; - this.suitCaseStatus = suitCaseStatus; + this.suitCaseStatusCode = suitCaseStatusCode; this.key = key; this.auth = auth; this.request = request; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java index 5f721ec..9230fc5 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java @@ -36,7 +36,7 @@ public class SoftswitchHqlPack { StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getStringLikerPack(testDataBase.getName(),"name",result); +// HqlPack.getStringLikerPack(testDataBase.getName(),"name",result); return result.toString(); } From 33a59fdb0fe8a49efd55894187d4e7979d9dc75b Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 30 Jul 2019 10:04:42 +0800 Subject: [PATCH 21/25] 0730 add esop pojo and respository --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java | 65 ++++++++++++++++++++++ .../pojo/mes/pcn/repository/MesESOPRepository.java | 17 ++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesESOP.java | 65 ++++++++++++++++++++++ .../pojo/mes/repository/MesESOPRepository.java | 17 ++++++ 4 files changed, 164 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java new file mode 100644 index 0000000..baed2c2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_ESOP") +@Api("作业指导书信息表(ODS)") +public class MesESOP extends BaseBean { + + @Column(name="PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name="PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步序号") + private Integer stepSeq; + + @Column(name="SOP_NAME") + @ApiParam("SOP名称") + private String sopName; + + @Column(name="SOP_URL") + @ApiParam("SOP_URL") + private String sopUrl; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java new file mode 100644 index 0000000..9f76128 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesESOP; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesESOPRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java new file mode 100644 index 0000000..1dbdf9f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_ESOP") +@Api("作业指导书信息表(ODS)") +public class MesESOP extends BaseBean { + + @Column(name="PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name="PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步序号") + private Integer stepSeq; + + @Column(name="SOP_NAME") + @ApiParam("SOP名称") + private String sopName; + + @Column(name="SOP_URL") + @ApiParam("SOP_URL") + private String sopUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java new file mode 100644 index 0000000..367ef81 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesActionMethod; +import cn.estsh.i3plus.pojo.mes.bean.MesESOP; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesESOPRepository extends BaseRepository { +} From 898e1d39d4afd35d8ff9b91cfa63fb421a063bca Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 30 Jul 2019 10:17:56 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E5=9B=9E=E4=BC=A0ERP=EF=BC=8C=E5=86=99=E5=85=A5move=5Fto=5Ferp?= =?UTF-8?q?=E6=97=B6=E5=81=9A=E5=8D=95=E4=BD=8D=E8=BD=AC=E6=8D=A2=20?= =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99=E6=89=A3=E5=87=8F=EF=BC=8C=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 23dca00..ca2a416 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -111,6 +111,10 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("前端表格编辑使用") public Boolean isSet = false; + @Transient + @ApiParam("源单位") + public String srcUnit; + public Double getQty() { return this.qty == null ? 0 : this.qty; } From 651577d5adb42f8deddd91d08be98dc36ab79908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 30 Jul 2019 10:58:35 +0800 Subject: [PATCH 23/25] =?UTF-8?q?model=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=88dragon=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java index 30fe13b..25ed168 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -17,5 +17,5 @@ import java.util.List; @Data public class WmsMoveDetailsModel implements Serializable { private WmsMoveDetails details; - private List moveSn; + private List moveSnList; } From 871dbed84a1fe45ac6706f010eee7146a4074dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 30 Jul 2019 18:14:44 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 59ed0dd..b86e93b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -40,7 +40,7 @@ public class WmsUnit extends BaseBean { @ApiParam(value = "单位精度") private Integer unitPrecision; - public int getUnitPrecisionValue(){ + public Integer getUnitPrecisionValue(){ return this.unitPrecision == null?0:this.unitPrecision.intValue(); } 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 c7628d4..c9fe1f4 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 @@ -60,8 +60,12 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixMac(), "fixMac", result); DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixName(), "fixName", result); - getStringBuilderPack(wmsFix, result); + if (StringUtils.isNotBlank(wmsFix.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(wmsFix.getOrganizeCode(), "organizeCode", result); + } + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(wmsFix.getIsValid(), "isValid", result); return result; } @@ -1024,6 +1028,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getBusiTypeCode(), "busiTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result); DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); From 30750923d17c2b1dd939f56b1aafc092cd46a393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 30 Jul 2019 18:23:19 +0800 Subject: [PATCH 25/25] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 889fa6a..ff1eadc 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 @@ -108,7 +108,7 @@ public class WmsInterfaceDataMapper extends BaseBean { * 同步频率 */ @Column(name = "SYNC_FREQUENCY") - public int syncFrequency; + public Integer syncFrequency; /** * 上次同步时间