diff --git a/i3plus-pojo.iml b/i3plus-pojo.iml deleted file mode 100644 index ec94526..0000000 --- a/i3plus-pojo.iml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-base/i3plus-pojo-base.iml b/modules/i3plus-pojo-base/i3plus-pojo-base.iml deleted file mode 100644 index 5dd064c..0000000 --- a/modules/i3plus-pojo-base/i3plus-pojo-base.iml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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; diff --git a/modules/i3plus-pojo-form/i3plus-pojo-form.iml b/modules/i3plus-pojo-form/i3plus-pojo-form.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-form/i3plus-pojo-form.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml b/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml deleted file mode 100644 index d75c4ad..0000000 --- a/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml b/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml deleted file mode 100644 index d75c4ad..0000000 --- a/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml b/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml b/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-model/i3plus-pojo-model.iml b/modules/i3plus-pojo-model/i3plus-pojo-model.iml deleted file mode 100644 index 97faa2e..0000000 --- a/modules/i3plus-pojo-model/i3plus-pojo-model.iml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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-platform/i3plus-pojo-platform.iml b/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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-report/i3plus-pojo-report.iml b/modules/i3plus-pojo-report/i3plus-pojo-report.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-report/i3plus-pojo-report.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml b/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml b/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml b/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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 d240f9d..79d7ec6 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; @@ -108,7 +106,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); - + HqlPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); getStringBuilderPack(wmsDocMovementDetails, result); return result.toString(); @@ -304,11 +302,11 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result); - DdlPreparedPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); - DdlPreparedPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); - DdlPreparedPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); getStringBuilderPack(wmsLocate, result); @@ -1307,20 +1305,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; - } /** * 作业步骤调用参数信息 查询条件封装 @@ -1340,62 +1324,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 @@ -1657,8 +1585,8 @@ public class WmsHqlPack { */ public static String packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsDocMovementSn.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); getStringBuilderPack(wmsDocMovementSn, result); diff --git a/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml b/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml deleted file mode 100644 index d75c4ad..0000000 --- a/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file