Merge remote-tracking branch 'remotes/origin/dev' into test

yun-zuoyi
jimmy.zeng 6 years ago
commit d5eecaba0c

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -910,9 +910,10 @@ public class CommonEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CONTENT_TYPE {
FORM("x-www-form-urlencoded", "表单"),
FILE(" multipart/form-data", "文件"),
JSON(" application/json", "JSON"),
XML(" application/xml ", "XML");
FILE("multipart/form-data", "文件"),
JSON("application/json", "JSON"),
NONE("default", "默认不需要设置Content-Type"),
XML("application/xml", "XML");
private String value;
private String description;

@ -12,6 +12,43 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* mes-pcn
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PCN_TASK_STATUS {
OPEN(1, "开启"),
CLOSE(2, "关闭");
private int value;
private String description;
MES_PCN_TASK_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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;
}
}
/**
* mes
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

@ -1320,7 +1320,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALD_EXECUTE_STATUS {
NORMAL(10, "创建"),
CREATE(10, "创建"),
PROCESSING(20, "处理中"),
COMPLETED(30, "已完成");
private int value;
@ -2759,7 +2759,7 @@ public class WmsEnumUtil {
public enum STOCK_LEVEL_STATUS {
LOW("LOW", "低于最低库存"),
HIGH("HIGH", "高于最高库存"),
NORMAL("NORMAL", "安全库存");
NORMAL("CREATE", "安全库存");
private String value;
private String description;

@ -14,6 +14,7 @@ import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
import javax.persistence.*;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.text.SimpleDateFormat;
import java.util.*;
@ -1190,8 +1191,15 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
//属性值过滤避免null值
if(initParam){
for(Field checkField : clazz.getFields()){
if(checkField.get(item) == null){
for (Field checkField : clazz.getFields()) {
if (!Modifier.isFinal(checkField.getModifiers()) && checkField.get(item) == null) {
// 未赋值的属性,进行初始化赋值
fieldSetInitParam(item, checkField);
}
}
for (Field checkField : clazz.getDeclaredFields()) {
checkField.setAccessible(true);
if (!Modifier.isFinal(checkField.getModifiers()) && checkField.get(item) == null) {
// 未赋值的属性,进行初始化赋值
fieldSetInitParam(item, checkField);
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description : 线
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-09-01 11:02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PCN_SYS_USER_OFFLINE")
@Api(value="账号离线登陆表",description = "账号离线登陆表。")
public class MesPcnSysUserOffline extends BaseBean {
@Column(name = "USER_ID")
@ApiParam(value = "人员ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@Column(name = "USER_NAME")
@ApiParam(value = "用户名称", access = "账号名称")
private String userName;
@Column(name = "LOGIN_NAME")
@ApiParam(value = "登陆名称", access = "登陆名称")
private String loginName;
@Column(name="ORGANIZE_ID")
@ApiParam(value ="部门ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
@Column(name="ORGANIZE_NAME")
@ApiParam(value ="部门名称" , access ="部门名称")
private String organizeName;
}

@ -0,0 +1,16 @@
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.MesPcnSysUserOffline;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-09-02
* @Modify:
**/
@Repository
public interface MesPcnSysUserOfflineRepository extends BaseRepository<MesPcnSysUserOffline, Long> {
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -1170,4 +1170,21 @@ public class MesHqlPack {
packBean.setOrderByStr(mesPcnTask.orderBy());
return packBean;
}
/**
*
* @param numberRule
* @param id
* @param organizeCode
* @return
*/
public static DdlPackBean getMesNumberRuleCheck(String numberRule, Long id, String organizeCode) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(numberRule, "numberRule", packBean);
if (null != id) {
DdlPreparedPack.getNumNOEqualPack(id, "id", packBean);
}
return packBean;
}
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -28,102 +28,99 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_ACTION_LOG")
@Api(value="作业记录表")
@Table(name = "WMS_ACTION_LOG")
@Api(value = "作业记录表")
public class WmsActionLog extends BaseBean {
private static final long serialVersionUID = 8664373854844368861L;
@Column(name="TASK_NO")
@Column(name = "TASK_NO")
@ApiParam(value = "作业任务编号", example = "1")
@JsonSerialize(using = ToStringSerializer.class)
public String taskNo;
@Column(name="TRANS_TYPE_CODE")
@Column(name = "TRANS_TYPE_CODE")
@ApiParam(value = "交易类型编号")
public String transTypeCode;
@Column(name="MOVE_NO")
@Transient
@Column(name = "MOVE_NO")
@ApiParam(value = "移动单单号")
public String moveNo;
@Column(name="AG_ID")
@Column(name = "AG_ID")
@ApiParam(value = "作业流程编号", example = "1")
@JsonSerialize(using = ToStringSerializer.class)
public Long agId;
//get单独处理
public Long getAgId() {
if(agId != null) {
return agId.longValue();
}else{
return agId;
}
public long getAgIdVal() {
return agId == null ? 0 : agId.longValue();
}
@Column(name = "AL_NAME_RDD")
@ApiParam(value = "流程名称")
public String agNameRdd;
@Column(name="ACTION_USER_NAME")
@Column(name = "ACTION_USER_NAME")
@ApiParam(value = "作业人员")
public String actionUserName;
@Column(name="FIX_NO")
@Column(name = "FIX_NO")
@ApiParam(value = "设备编号")
public String fixNo;
@Column(name="START_TIME")
@Column(name = "START_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "开始作业时间")
public String startTime;
@Column(name="END_TIME")
@Column(name = "END_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "结束作业时间")
public String endTime;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="开始作业时间查询用,查询起始日期",example = "2018-01-01 01:00:00")
@ApiParam(value = "开始作业时间查询用,查询起始日期", example = "2018-01-01 01:00:00")
public String startTimeStart;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="开始作业时间查询用,查询结束日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "开始作业时间查询用,查询结束日期", example = "2018-12-31 23:59:59")
public String startTimeEnd;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="结束作业时间查询用,查询起始日期",example = "2018-01-01 01:00:00")
@ApiParam(value = "结束作业时间查询用,查询起始日期", example = "2018-01-01 01:00:00")
public String endTimeStart;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="结束作业时间查询用,查询结束日期",example = "2018-12-31 23:59:59")
@ApiParam(value = "结束作业时间查询用,查询结束日期", example = "2018-12-31 23:59:59")
public String endTimeEnd;
// 状态:1=创建,10=处理中,20=已完成
@Column(name="ACTION_STATUS")
@Column(name = "ACTION_STATUS")
@ApiParam(value = "作业状态", example = "1")
public Integer actionStatus;
@Column(name="TOTAL_STEP")
@Column(name = "TOTAL_STEP")
@ApiParam(value = "总步数", example = "1")
public Integer totalStep;
@Column(name="CURRENT_STEP")
@Column(name = "CURRENT_STEP")
@ApiParam(value = "当前步骤", example = "1")
public Integer currentStep;
@Column(name="INIT_AM_ID")
@Column(name = "INIT_AM_ID")
@ApiParam(value = "初始化组件编号", example = "0")
public Long initAmId;
@Column(name="DETAILS_AM_ID")
@Column(name = "DETAILS_AM_ID")
@ApiParam(value = "明细处理组件编号", example = "0")
public Long detailsAmId;
@Column(name="END_AM_ID")
@Column(name = "END_AM_ID")
@ApiParam(value = "结束组件编号", example = "0")
public Long endAmId;

@ -36,9 +36,9 @@ public class WmsActionLogDetails extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
public Long alId;
@Column(name = "AL_NAME_RDD")
@ApiParam(value = "流程名称")
public String agNameRdd;
@Column(name = "AG_ID")
@ApiParam(value = "流程ID")
public Long agId;
@Column(name = "SEQ")
@ApiParam(value = "序号", example = "1")
@ -113,6 +113,9 @@ public class WmsActionLogDetails extends BaseBean {
@ApiParam(value = "作业流程明细ID", example = "1")
public Long agdId;
@Column(name="MOVE_NO")
@ApiParam(value = "移动单单号")
public String moveNo;
public Long getAsId() {
if (asId != null) {
return asId.longValue();

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -104,6 +106,7 @@ public class WmsMoveDetails extends BaseBean {
*/
@Column(name="ITEM_STATUS")
@ApiParam(value = "状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
public Integer itemStatus;
@Column(name="REF_ITEM")
@ -150,18 +153,23 @@ public class WmsMoveDetails extends BaseBean {
private Integer busiTypeCode;
@Transient
@ApiParam("生产线")
private String workCenterCode;
@Transient
@ApiParam("父物料编码")
private String fPartNo;
@Transient
@ApiParam("父物料名称")
private String fPartName;
@Transient
@ApiParam("数量")
private Double qty;
@Transient
@ApiParam("创建时间")
private String createDateTime;
public WmsMoveDetails(){}

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -40,6 +42,7 @@ public class WmsMoveMaster extends BaseBean {
*/
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
public Integer orderStatus;
@Column(name = "REMARK")
@ -65,6 +68,7 @@ public class WmsMoveMaster extends BaseBean {
@Column(name = "BUSI_TYPE_CODE")
@ApiParam(value = "业务类型编码")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
private Integer busiTypeCode;
@Column(name = "REF_ORDER_NO")
@ -77,6 +81,7 @@ public class WmsMoveMaster extends BaseBean {
@Transient
@ApiParam("状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
private Integer itemStatus;
@Transient

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -66,6 +68,7 @@ public class WmsMoveSn extends BaseBean {
*/
@Column(name="ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
public Integer itemStatus;
@Column(name="REMARK")
@ -129,18 +132,22 @@ public class WmsMoveSn extends BaseBean {
@Column(name="SRC_QC_STATUS")
@ApiParam(value = "源质量状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
public Integer srcQcStatus;
@Column(name="SRC_SN_STATUS")
@ApiParam(value = "源条码状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer srcSnStatus;
@Column(name="DEST_QC_STATUS")
@ApiParam(value = "目的质量状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
public Integer descQcStatus;
@Column(name="DEST_SN_STATUS")
@ApiParam(value = "目的条码状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer destSnStatus;
@Column(name="DATE_CODE")

@ -2272,7 +2272,7 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsActionLogByActionLog(WmsActionLog actionLog) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", packBean, false, false);
DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean);
// DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean);
DdlPreparedPack.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", packBean);
DdlPreparedPack.getStringEqualPack(actionLog.getFixNo(), "fixNo", packBean);
DdlPreparedPack.getNumEqualPack(actionLog.getAgId(), "agId", packBean);

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>

Loading…
Cancel
Save