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
陈思洁 5 years ago
parent b5d50af250 629e2f8270
commit 9d5eac441e
19 changed files with 193 additions and 105 deletions
Show Stats Download Patch File Download Diff File

43
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java
Unescape Escape View File

@ -0,0 +1,43 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.base.common.Pager;
import io.swagger.annotations.Api;
import lombok.Data;
import java.util.List;
/**
* @Description : 甘特图分页查询参数
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-11-22
* @Modify:
**/
@Data
@Api("甘特图分页查询参数")
public class GanttPager extends Pager {
public static class SortData {
// 排序对象
private String field;
// 排序类型，1为升序，0为降序
private Boolean ascending;
public String getField() {
return field;
}
public void setField(String field) {
this.field = field;
}
public Boolean getAscending() {
return ascending;
}
public void setAscending(Boolean ascending) {
this.ascending = ascending;
}
}
private String filter;
private List<SortData> sorts;
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java → modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java
Unescape Escape View File

@ -10,7 +10,7 @@ import lombok.Data;
import java.util.Date;
@Data
public class ResourceLodaRequest {
public class ResourceLoadRequest {
private ApsEnumUtil.RESOURCE_LOAD_SPAN span;
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)

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

@ -615,7 +615,8 @@ public class BlockSoftSwitchEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATABASE_OPERATE_TYPE{
READ(1,"读取"),
WRITE(2,"写入");
WRITE(2,"写入"),
BATCH_WRITE(3,"批量写入");
private int value;
private String description;

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

@ -12,6 +12,76 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* JIS发运模式类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_PATTERN_TYPE {
ONE(10, "一套发运"),
TRUE(20, "多套发运"),
FALSE(30, "单产品多套发运");
private int value;
private String description;
MES_JIS_PATTERN_TYPE(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;
}
}
/**
* 是否解析
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PLC_IS_PARSE {
TRUE(1, "是"),
FALSE(2, "否");
private int value;
private String description;
PLC_IS_PARSE(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;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CALENDAR_TYPE {
@ -2351,82 +2421,6 @@ public class MesEnumUtil {
}
/**
* mes按钮状态配置 判断符号
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_BUTTON_STATUS_JUDGE_FLAG {
EQUAL("=", "等于"),
NOT_EQUAL("!=", "不等于"),
GREATER_THAN(">", "大于"),
NOT_LESS_THAN(">=", "大于大于"),
LESS_THAN("<", "小于"),
NOT_GREATER_THAN("<=", "小于等于");
private String value;
private String description;
MES_BUTTON_STATUS_JUDGE_FLAG(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* mes按钮状态配置 逻辑符号
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_BUTTON_STATUS_LOGIC_FLAG {
AND("&&", "逻辑与"),
OR("||", "逻辑或");
private String value;
private String description;
MES_BUTTON_STATUS_LOGIC_FLAG(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesWorkOrder实体对应的approvalStatus值 审批状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -2860,7 +2854,8 @@ public class MesEnumUtil {
STANDARD_ORDER(10, "标准工单"),
BTS_ORDER(20, "BTS工单"),
ATTEMPT_ORDER(30, "试制工单"),
BH_ORDER(40, "B&H工单");;
BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单");
private int value;
private String description;

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

@ -1659,7 +1659,8 @@ public class MesPcnEnumUtil {
STANDARD_ORDER(10, "标准工单"),
BTS_ORDER(20, "BTS工单"),
ATTEMPT_ORDER(30, "试制工单"),
BH_ORDER(40, "B&H工单");
BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单");
private int value;
private String description;

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

@ -239,7 +239,7 @@ public class WmsEnumUtil {
RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
CLOSED(40, "CLOSED", "已关闭"),
CANCELLED(50, "CANCELLED", "已取消"),
FINISH_PRODUCT_SHIPING_PICKED(60, "FINISH_PRODUCT_SHIPING_PICKED", "配料完成");
BATCHING_FINISH(60, "BATCHING_FINISH", "配料完成");
private int value;
private String code;
@ -701,7 +701,8 @@ public class WmsEnumUtil {
KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"),
PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库");
PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"),
UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用");
private int value;
private String code;
@ -885,7 +886,8 @@ public class WmsEnumUtil {
VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY", "VDA事务查询"),
VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PICK_RC("KT_PICK_RC", "坤泰拣货");
KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用");
private String value;
private String description;

5
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java
Unescape Escape View File

@ -27,6 +27,11 @@ import javax.persistence.Table;
@Table(name = "MES_WORK_CELL_POINT")
@Api("工站队列")
public class MesWorkCellPoint extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;

8
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
Unescape Escape View File

@ -40,6 +40,14 @@ public class QueueOrderModel implements Serializable {
@Transient
@ApiParam("显示颜色")
private String color;
@ApiParam("工厂代码")
private String organizeCode;
@ApiParam("展示行数")
private Integer prodNum;
@ApiParam("产线")
private String workCenterCode;
@ApiParam("工位")
private String workCellCode;
public QueueOrderModel() {
}

18
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java
Unescape Escape View File

@ -37,21 +37,9 @@ public class MesButtonStatus extends BaseBean {
@ApiParam("实体类名称")
private String ClassName;
@Column(name = "STATUS_FIELD")
@ApiParam("状态字段")
private String statusField;
@Column(name = "JUDGE_FLAG")
@ApiParam("判断符合")
private String judgeFlag;
@Column(name = "STATUS_VALUE")
@ApiParam("状态值")
private String statusValue;
@Column(name = "LOGIC_FLAG")
@ApiParam("逻辑符合")
private String logicFlag;
@Column(name = "APPEND_HQL")
@ApiParam("拼接HQL")
private String appendHql;
@Column(name = "STATUS_DESC")
@ApiParam("描述")

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
Unescape Escape View File

@ -31,6 +31,11 @@ import java.util.List;
@Table(name = "MES_WORK_CELL_POINT")
@Api("工站队列")
public class MesWorkCellPoint extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -2097,4 +2097,6 @@ public class MesHqlPack {
}
return packBean;
}
}

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

@ -70,6 +70,12 @@ public class SysLocaleResource extends BaseBean {
@ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description",required = false)
private Integer softType;
public int getSoftTypeVal(){
if(softType==null){
return CommonEnumUtil.SOFT_TYPE.IMPP.getValue();
}
return softType.intValue();
}
//系统自带需要有初始化表，只能修改value，无法删除。
@Column(name="is_system")

19
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
Unescape Escape View File

@ -13,10 +13,12 @@ import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.math.NumberUtils;
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 : 适配器出入参
@ -53,6 +55,10 @@ public class BsSuitCaseParam extends BaseBean {
@ApiParam(value = "参数名称)")
private String paramName;
@Column(name = "PARENT_PARAM_Id")
@ApiParam(value = "上级参数id")
private String parentParamId;
@Column(name = "PARENT_PARAM_NAME")
@ApiParam(value = "上级参数名称)")
private String parentParamName;
@ -80,7 +86,18 @@ public class BsSuitCaseParam extends BaseBean {
@Transient
@ApiParam(value = "参数值")
private String paramValue;
private Object paramValue;
public String getParamValueStr() {
if (paramValue == null) {
return null;
}
return paramValue.toString();
}
@Transient
@ApiParam(value = "子级参数")
private List<BsSuitCaseParam> bsSuitCaseParamList;
}

7
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java
Unescape Escape View File

@ -7,10 +7,8 @@ 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.Index;
import javax.persistence.Table;
import javax.persistence.*;
/**
* @Description : 适配记录参数
@ -38,6 +36,7 @@ public class BsSuitRecordParam extends BaseBean {
@ApiParam(value = "参数名称")
private String paramName;
@Lob
@Column(name = "PARAM_VAL")
@ApiParam(value = "参数值")
private String paramVal;

1
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
Unescape Escape View File

@ -338,6 +338,7 @@ public class SoftSwitchHqlPack {
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true);
ddlPackBean.setOrderByStr(bsSuitRecord.orderBy());

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

@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
@ -28,7 +29,11 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_CS_DETAILS")
@Table(name = "WMS_DOC_CS_DETAILS", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "VENDOR_NO"),
@Index(columnList = "SN")
})
@Api("盘点单冻结信息")
public class WmsCSOrderDetails extends BaseBean {
private static final long serialVersionUID = 1054153436116196360L;

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -132,4 +133,9 @@ public class WmsDocFgDetail extends BaseBean {
@Column(name="COMMIT_DATE")
@ApiParam("提交日期")
public String commitDate;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "BOM生效日期")
@Column(name = "EFF_START_TIME")
private String effStartTime;
}

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

@ -278,6 +278,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam("是否寄售 1-是 2-否")
private Integer consignation;
@Transient
@ApiParam(value = "是否最早批次")
public String isFifo;
public WmsStockSn() {
}

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

@ -2427,7 +2427,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLeftLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result);
// DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);

Write Preview
Loading…
Cancel
Save