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 c221d618ea acd4bb7348
commit ffb29d0d03
18 changed files with 315 additions and 34 deletions
Show Stats Download Patch File Download Diff File

33
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java
Unescape Escape View File

@ -96,16 +96,43 @@ public class BaseResultBean<Obj> {
}
public static BaseResultBean buildBaseResultBean(boolean success,String msg){
BaseResultBean rs = new BaseResultBean();
BaseResultBean rs = new BaseResultBean();
rs.success = success;
if(success) {
if (success) {
rs.msg = msg;
rs.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
}else {
} else {
rs.code = ResourceEnumUtil.MESSAGE.FAIL.getCode();
rs.errorMsg = msg;
}
return rs;
}
public BaseResultBean setResultList(List<Obj> resultList) {
this.resultList = resultList;
return this;
}
public BaseResultBean setResultObject(Obj resultObject) {
this.resultObject = resultObject;
return this;
}
public BaseResultBean setResultMap(Map<String, Object> resultMap) {
this.resultMap = resultMap;
return this;
}
public BaseResultBean setPager(Pager pager) {
this.pager = pager;
return this;
}
public BaseResultBean setListPager(ListPager<Obj> listPager) {
this.listPager = listPager;
this.setPager(listPager.getObjectPager());
this.setResultList(listPager.getObjectList());
return this;
}
}

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

@ -20,6 +20,13 @@ public class CommonEnumUtil {
CORE(2, "i3core", "i3业务平台"),
WMS(3, "i3wms", "仓库管理软件"),
MES(4, "i3mes", "生产管理软件"),
QMS(5, "i3qms", "质量管理软件"),
FORM(80,"block-form","智能表单"),
REPORT(81,"block-report","智能报表"),
WORKFLOW(82,"block-workflow","智能工作流"),
JOBFLOW(83,"block-jobflow","智能作业流"),
SOFTSWITCH(84,"block-softswitch","智能软件适配器"),
HARDSWITCH(85,"block-hardswitch","智能硬件适配器"),
CONSOLE(95,"impp-console","服务监控台"),
GATEWAY(96,"impp-gateway","服务网关"),
CLOUD(97,"i3cloud","微服务"),
@ -608,27 +615,53 @@ public class CommonEnumUtil {
* 服务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CLOUD_STATUS {
REGISTERED(1, "注册"),
DISCONNECT(2, "断开");
public enum CLOUD_APP_STATUS {
UP(1,"UP" ,"在线"),
DOWN(2, "DOWN","断线");
private int value;
private String code;
private String description;
private CLOUD_APP_STATUS(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;
}
private CLOUD_STATUS(int value, String description) {
this.value = value;
this.description = 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 String valueOf(int val) {
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) {
@ -637,6 +670,16 @@ public class CommonEnumUtil {
}
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;
}
}
/**

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

@ -209,6 +209,16 @@ public class ImppEnumUtil {
return tmp;
}
public static String valueOfName(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].name;
}
}
return tmp;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {

17
modules/i3plus-pojo-form/pom.xml
Unescape Escape View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-form</artifactId>
<packaging>jar</packaging>
</project>

17
modules/i3plus-pojo-hardswitch/pom.xml
Unescape Escape View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-hardswitch</artifactId>
<packaging>jar</packaging>
</project>

17
modules/i3plus-pojo-jobflow/pom.xml
Unescape Escape View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-jobflow</artifactId>
<packaging>jar</packaging>
</project>

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

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.model.wms;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description : 基类：组件参数
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-12-17 11:39
* @Modify:
**/
@Data
public abstract class BaseComponetsParam implements Serializable {
@ApiParam(value = "单据号")
public String orderNo;
@ApiParam(value = "单据类型")
public String orderType;
@ApiParam(value = "条码")
public String sn;
@ApiParam(value = "条码类型")
public String snType;
@ApiParam(value = "用户编号")
public String userNo;
@ApiParam(value = "设备编号")
public String fixNo;
@ApiParam(value = "工厂代码")
public String organizeCode;
}

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

@ -0,0 +1,21 @@
package cn.estsh.i3plus.pojo.model.wms;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : 收货扫描条码组件 参数封装
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-12-17 11:50
* @Modify:
**/
@Data
public class TransSnModle extends BaseComponetsParam{
@ApiParam(value = "移动单号")
public String moveNo;
@ApiParam(value = "交易类型代码")
public String transTypeCode;
}

9
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogException.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -33,6 +34,14 @@ public class SysLogException extends BaseBean {
@ApiParam(value ="系统模块（枚举）", example = "1")
private Integer excModule;
private String excModuleName;
public String getExcModuleName(){
if(this.excModule != null){
return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.excModule);
}
return excModuleName;
}
@Column(name="EXC_CLASS_NAME")
@ApiParam(value ="异常类名")
private String excClassName;

9
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -35,6 +36,14 @@ public class SysLogOperate extends BaseBean {
@ApiParam(value ="系统模块（枚举）", example = "1")
private Integer operateModule;
private String operateModuleName;
public String getOperateModuleName(){
if(this.operateModule != null){
return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.operateModule);
}
return operateModuleName;
}
//ImppEnumUtil.OPERATE_TYPE（枚举）
@Column(name="OPERATE_TYPE")
@ApiParam(value ="操作类型" , example = "-1")

17
modules/i3plus-pojo-report/pom.xml
Unescape Escape View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-report</artifactId>
<packaging>jar</packaging>
</project>

17
modules/i3plus-pojo-softswitch/pom.xml
Unescape Escape View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-softswitch</artifactId>
<packaging>jar</packaging>
</project>

43
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java
Unescape Escape View File

@ -27,20 +27,20 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_ACTION_LOG_DETAILS")
@Api(value="作业记录明细表",description = "作业记录表")
@Table(name = "WMS_ACTION_LOG_DETAILS")
@Api(value = "作业记录明细表", description = "作业记录表")
public class WmsActionLogDetails extends BaseBean {
@Column(name="AL_ID")
@Column(name = "AL_ID")
@ApiParam(value = "作业流程ID", example = "1")
@JsonSerialize(using = ToStringSerializer.class)
public Long alId;
//get单独处理
public Long getAlId() {
if(alId != null) {
if (alId != null) {
return alId.longValue();
}else{
} else {
return alId;
}
}
@ -49,56 +49,65 @@ public class WmsActionLogDetails extends BaseBean {
@ApiParam(value = "流程名称")
public String agNameC;
@Column(name="SEQ")
@Column(name = "SEQ")
@ApiParam(value = "序号", example = "1")
public Integer seq;
@Column(name="OK_SEQ")
@Column(name = "OK_SEQ")
@ApiParam(value = "成功跳转步骤", example = "1")
public Integer okSeq;
@Column(name="NG_SEQ")
@Column(name = "NG_SEQ")
@ApiParam(value = "失败跳转步骤", example = "1")
public Integer ngSeq;
// 10=只输入一次,20=输入多次,30=输入多次不允许重复,40=本流程结束
@Column(name="VALUE_TYPE")
@Column(name = "VALUE_TYPE")
@ApiParam(value = "动作类型", example = "1")
public Integer valueType;
// 1=是,2=否
@Column(name="TO_UPPER")
@Column(name = "TO_UPPER")
@ApiParam(value = "是否转为大写", example = "1")
public Integer toUpper;
@Column(name="LEN_CHECK")
@Column(name = "LEN_CHECK")
@ApiParam(value = "长度检查", example = "1")
public Integer lenCheck;
@Column(name="AS_ID")
@Column(name = "AS_ID")
@ApiParam(value = "作业步骤", example = "1")
@JsonSerialize(using = ToStringSerializer.class)
public Long asId;
//get单独处理
public Long getAsId() {
if(asId != null) {
if (asId != null) {
return asId.longValue();
}else{
} else {
return asId;
}
}
@Column(name="ALD_STATUS")
@Column(name = "ALD_STATUS")
@ApiParam(value = "执行状态", example = "1")
public Integer aldStatus;
@Column(name="START_TIME")
@Column(name = "START_TIME")
@ApiParam(value = "开始执行时间")
public String startTime;
@Column(name="END_TIME")
@Column(name = "END_TIME")
@ApiParam(value = "结束执行时间")
public String endTime;
public WmsActionLogDetails() {
}
public WmsActionLogDetails(String createUser, Long id, Integer seq) {
this.createUser = createUser;
this.id = id;
this.seq = seq;
}
}

11
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java
Unescape Escape View File

@ -6,7 +6,6 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @Description : PDA传输到后台的实体bean对象
@ -32,13 +31,17 @@ public class WmsOperationBean extends BaseBean {
public String alId;
/**
* 触发源:10=扫描枪,
* 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除)
* 触发源:
* 10=扫描枪,
* 20=提交按钮,
* 30=重置按钮,
* 40=查看明细,
* 50=明细(删除),
* 60=明细（清空）
*/
@ApiParam("触发源")
public int sourceOwner;
@ApiParam("选中的明细数据")
public List<Map<String, Object>> details;
public List<String> details;
}

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

@ -181,8 +181,12 @@ public class WmsHqlPack {
//查询参数封装
HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false);
HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false);
if (StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateEnd())) {
HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false);
}
if (StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateEnd())) {
HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false);
}
getStringBuilderPack(wmsIbCheckPlan, result);

17
modules/i3plus-pojo-workflow/pom.xml
Unescape Escape View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-workflow</artifactId>
<packaging>jar</packaging>
</project>

6
pom.xml
Unescape Escape View File

@ -23,6 +23,12 @@
<module>modules/i3plus-pojo-model</module>
<module>modules/i3plus-pojo-mes</module>
<module>modules/i3plus-pojo-wms</module>
<module>modules/i3plus-pojo-form</module>
<module>modules/i3plus-pojo-hardswitch</module>
<module>modules/i3plus-pojo-jobflow</module>
<module>modules/i3plus-pojo-report</module>
<module>modules/i3plus-pojo-softswitch</module>
<module>modules/i3plus-pojo-workflow</module>
</modules>
<dependencies>

2
readme.txt
Unescape Escape View File

@ -1,5 +1,5 @@
模型工程
主要用于各类对象木星
主要用于各类对象模型
i3plus-pojo-mes:生产相关的对象模型
i3plus-pojo-wms:仓库相关的对象模型

Write Preview
Loading…
Cancel
Save