From f1993e69c8c47ea3c24f6fba3593619e6b1e1186 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Thu, 11 Apr 2019 18:50:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?sweb=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 47cee30..0cee07c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -18,9 +18,9 @@ public class SwebEnumUtil { public enum ORDER_MASTER_STATUS { CREATE(10, "新建"), RECEIPT(20, "已发布"), - RECEIPT_FINISH(30, "已确认"), + SURE(30, "已确认"), CLOSED(40, "已打印"), - CANCELLED(50, "已发货"); + DELIVERY(50, "已发货"); private int value; private String description; @@ -66,9 +66,9 @@ public class SwebEnumUtil { public enum ORDER_DETAILS_STATUS { CREATE(10, "新建"), RECEIPT(20, "已发布"), - RECEIPT_FINISH(30, "已确认"), + SURE(30, "已确认"), CLOSED(40, "已打印"), - CANCELLED(50, "已发货"); + DELIVERY(50, "已发货"); private int value; private String description; From 8684d95c1ef3e69499d5b545caac706ef729cff8 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 11 Apr 2019 19:30:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/OperationDbModle.java | 25 ++++++++ .../pojo/platform/platbean}/WmsActionLog.java | 2 +- .../pojo/platform/platbean}/WmsActionLogData.java | 2 +- .../platform/platbean}/WmsActionLogDetails.java | 2 +- .../WmsActionLogDataMongoRepository.java | 14 +++++ .../WmsActionLogDetailsMongoRepository.java | 14 +++++ .../WmsActionLogMongoRepository.java | 14 +++++ .../i3plus/pojo/platform/sqlpack/WmsBsonPack.java | 64 +++++++++++++++++++ modules/i3plus-pojo-wms/pom.xml | 9 +-- .../wms/repository/WmsActionLogDataRepository.java | 17 ----- .../repository/WmsActionLogDetailsRepository.java | 16 ----- .../wms/repository/WmsActionLogRepository.java | 16 ----- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 72 ---------------------- 13 files changed, 139 insertions(+), 128 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean => i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean}/WmsActionLog.java (98%) rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean => i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean}/WmsActionLogData.java (97%) rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean => i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean}/WmsActionLogDetails.java (98%) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java new file mode 100644 index 0000000..93d7698 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 操作数据库表数据 参数封装 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-04-11 11:50 + * @Modify: + **/ +@Data +public class OperationDbModle{ + + @ApiParam(value = "DAO名称") + public String daoName; + + @ApiParam(value = "数据操作实体") + public Object object; + + // 10:新增，20：修改 + @ApiParam(value = "数据库操作类型") + public int actionDbType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java similarity index 98% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java index 6776ce7..b498c26 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean; +package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java similarity index 97% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java index d67742d..d162959 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean; +package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java similarity index 98% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java index 001acec..f99297c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean; +package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; 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 new file mode 100644 index 0000000..61e25a7 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java @@ -0,0 +1,14 @@ +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 new file mode 100644 index 0000000..a87ced1 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java @@ -0,0 +1,14 @@ +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 new file mode 100644 index 0000000..873ae06 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java @@ -0,0 +1,14 @@ +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 new file mode 100644 index 0000000..d295913 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java @@ -0,0 +1,64 @@ +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.getNumEqualPack(actionLog.getAgId(), "agId", 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); + 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.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-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..24c7bab 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -18,10 +18,11 @@ i3plus.pojo i3plus-pojo-base - - - - + + + + + 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 deleted file mode 100644 index 8875b03..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.BasVendor; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : amy - * @CreateDate : 2018-11-07 14:49 - * @Modify: - **/ -@Repository -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 deleted file mode 100644 index 280d727..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogDetails; -import org.springframework.stereotype.Repository; - -/** - * @Description : 作业记录明细 - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2018-11-23 14:03 - * @Modify: - **/ -@Repository -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 deleted file mode 100644 index 2c2da0b..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionLog; -import org.springframework.stereotype.Repository; - -/** - * @Description : 作业记录表 - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2018-11-23 14:02 - * @Modify: - **/ -@Repository -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 9271606..891ac98 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 @@ -6,12 +6,10 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import java.util.List; @@ -1306,20 +1304,6 @@ public class WmsHqlPack { return result; } - /** - * 作业记录参数信息 查询条件封装 - * - * @param wmsActionLogData - * @return - */ - public static DdlPackBean packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) { - DdlPackBean result = new DdlPackBean(); - - DdlPreparedPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result); - getStringBuilderPack(wmsActionLogData, result); - - return result; - } /** * 作业步骤调用参数信息 查询条件封装 @@ -1339,62 +1323,6 @@ public class WmsHqlPack { } /** - * 作业记录 查询条件封装 - * @param wmsActionLog - * @return - */ - public static DdlPackBean packHqlWmsActionLog(WmsActionLog wmsActionLog) { - DdlPackBean result = new DdlPackBean(); - - if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { - DdlPreparedPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), - "startTime", result, true); - } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { - DdlPreparedPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), - "endTime", result, true); - } - - // 作业流程编号 - DdlPreparedPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); - // 作业流程名称 - DdlPreparedPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); - // 单据编号 - DdlPreparedPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); - // 设备编号 - DdlPreparedPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result); - // 交易类型代码 - DdlPreparedPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result); - // 流程状态 - DdlPreparedPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result); - - getStringBuilderPack(wmsActionLog, result); - - return result; - } - - /** - * 作业记录明细 查询条件封装 - * @param wmsActionLogDetails - * @return - */ - public static DdlPackBean packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { - DdlPackBean result = new DdlPackBean(); - - //作业流程id（对应作业记录明细里自增的id） - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); - - getStringBuilderPack(wmsActionLogDetails, result); - - DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); - - return result; - } - - /** * PO订单条码表 分页查询 * * @param wmsPoSn From 7020b1a53405a0be3628eeace9566a46dedbe002 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 11 Apr 2019 21:58:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=89=8D=E7=AB=AF=EF=BC=9A=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=BA=A4=E6=98=93=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E5=8F=B7=E4=BD=9C=E4=B8=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=9B=20=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=B8=B8=E9=87=8FTASK=5FJOB,TRANS?= =?UTF-8?q?=5FAM=20+=20=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0=E7=A7=BB=E5=8A=A8=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20+=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E7=94=9F=E6=88=90component?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=91=BD=E5=90=8D=20+=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=86=BB=E7=BB=93=E6=95=B0=E9=87=8FHQL=20+?= =?UTF-8?q?=20=E4=BA=A4=E6=98=93=E5=8F=8D=E5=90=91=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E4=BA=A4=E6=98=93=E8=BF=87=E6=9C=9F=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E9=87=8F=E6=AF=94=E8=BE=83=E8=A6=81=E7=94=A8?= =?UTF-8?q?.doubleValue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 839fb10..d240f9d 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 @@ -917,6 +917,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); HqlPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); + HqlPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); HqlPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); HqlPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);