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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
wei.peng 6 years ago
parent 82d472466b a3f258dd1d
commit d70eec3967
14 changed files with 144 additions and 132 deletions
Show Stats Download Patch File Download Diff File

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

@ -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;

25
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java
Unescape Escape View File

@ -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;
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java
Unescape Escape View File

@ -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;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java
Unescape Escape View File

@ -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;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java
Unescape Escape View File

@ -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;

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java
Unescape Escape View File

@ -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<WmsActionLogData, Long> {
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java
Unescape Escape View File

@ -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<WmsActionLogDetails, Long> {
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java
Unescape Escape View File

@ -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<WmsActionLog, Long> {
}

64
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java
Unescape Escape View File

@ -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;
}
}

9
modules/i3plus-pojo-wms/pom.xml
Unescape Escape View File

@ -18,10 +18,11 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>i3plus.platform</groupId>-->
<!--<artifactId>i3plus-platform-common</artifactId>-->
<!--</dependency>-->
<!-- <dependency>-->
<!-- <groupId>i3plus.platform</groupId>-->
<!-- <artifactId>i3plus-platform</artifactId>-->
<!-- <version>1.0-DEV-SNAPSHOT</version>-->
<!-- </dependency>-->
</dependencies>

17
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java
Unescape Escape View File

@ -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<WmsActionLogData, Long> {
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java
Unescape Escape View File

@ -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<WmsActionLogDetails, Long> {
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java
Unescape Escape View File

@ -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<WmsActionLog, Long> {
}

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

@ -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;
@ -917,6 +915,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);
@ -1306,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;
}
/**
* 作业步骤调用参数信息 查询条件封装
@ -1339,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

Write Preview
Loading…
Cancel
Save