开线合并代码
commit
766d195088
@ -1,5 +1,4 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EDayShift {
|
||||
ResCalendar
|
||||
}
|
||||
|
@ -0,0 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EImportDetail {
|
||||
Project
|
||||
}
|
@ -1,6 +1,4 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EResCalendar {
|
||||
DayShifts,
|
||||
Resources,
|
||||
}
|
||||
|
@ -1,6 +1,4 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EResource {
|
||||
OperResources,
|
||||
WorkResources
|
||||
}
|
||||
|
@ -1,5 +1,4 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EStandOperation {
|
||||
Operations
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="Material">
|
||||
<Relation field="ProductRouting" name="ProductRouting" reverse="Material" type="ONE_TO_MULTI" owner="true">
|
||||
<Relation field="ProductRoutings" name="ProductRouting" reverse="Material" type="ONE_TO_MULTI" owner="true">
|
||||
</Relation>
|
||||
</Class>
|
@ -1,7 +1,3 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="ResCalendar">
|
||||
<Relation field="DayShifts" name="DayShift" reverse="ResCalendar" type="MULTI_TO_MULTI" owner="false">
|
||||
</Relation>
|
||||
<Relation field="Resources" name="Resource" type="MULTI_TO_MULTI" owner="false">
|
||||
</Relation>
|
||||
</Class>
|
@ -0,0 +1,38 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description :mes系统业务动作
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-12
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_CUST_PROD_LINE")
|
||||
@Api("客户产线代码")
|
||||
public class MesCustProdLine extends BaseBean {
|
||||
@Column(name="CUST_PROD_LINE_CODE")
|
||||
@ApiParam("客户产线代码")
|
||||
private String custProdLineCode;
|
||||
|
||||
@Column(name="CUST_PROD_LINE_NAME")
|
||||
@ApiParam("客户产线名称")
|
||||
private String custProdLineName;
|
||||
}
|
@ -0,0 +1,54 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description :mes客户表
|
||||
* @Reference :
|
||||
* @Author : crish
|
||||
* @CreateDate : 2019-04-22
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_CUSTOMER")
|
||||
@Api("客户产线代码")
|
||||
public class MesCustomer extends BaseBean {
|
||||
@Column(name="CUSTOMER_CODE")
|
||||
@ApiParam("客户代码")
|
||||
private String customerCode;
|
||||
|
||||
@Column(name="CUSTOMER_NAME")
|
||||
@ApiParam("客户名称")
|
||||
private String customerName;
|
||||
|
||||
@Column(name="BRIEF_TEXT")
|
||||
@ApiParam("客户简称")
|
||||
private String briefText;
|
||||
|
||||
@Column(name="ADDRESS")
|
||||
@ApiParam("客户地址")
|
||||
private String address;
|
||||
|
||||
@Column(name="CONTACT")
|
||||
@ApiParam("客户联系人")
|
||||
private String contact;
|
||||
|
||||
@Column(name="TELEPHONE")
|
||||
@ApiParam("客户电话")
|
||||
private String telephone;
|
||||
}
|
@ -0,0 +1,42 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description :零件种类
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_PART_CATEGORY")
|
||||
@Api("零件种类")
|
||||
public class MesPartCategory extends BaseBean {
|
||||
@Column(name="CATEGORY_CODE")
|
||||
@ApiParam("分类代码")
|
||||
private String categoryCode;
|
||||
|
||||
@Column(name="CATEGORY_NAME")
|
||||
@ApiParam("分类名称")
|
||||
private String categoryName;
|
||||
|
||||
@Column(name="CATEGORY_TYPE")
|
||||
@ApiParam("分类类型")
|
||||
private String categoryType;
|
||||
}
|
@ -0,0 +1,141 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.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;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-04-16-17:36
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_PLAN_ORDER")
|
||||
@Api("生产主计划")
|
||||
public class MesPlanOrder extends BaseBean {
|
||||
@Column(name="ORDER_NO")
|
||||
@ApiParam("生产计划单号")
|
||||
private String orderNo;
|
||||
|
||||
@Column(name="PO_TYPE")
|
||||
@ApiParam("计划类型")
|
||||
private Integer planType;
|
||||
|
||||
@Column(name="PROD_CFG_CODE")
|
||||
@ApiParam("产品配置代码")
|
||||
private String prodCfgCode;
|
||||
|
||||
@Column(name="PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name="PART_NAME_RDD")
|
||||
@ApiParam("物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@Column(name="PLAN_QTY")
|
||||
@ApiParam("计划数量")
|
||||
private Double planQty;
|
||||
|
||||
@Column(name="DECOMPOSE_QTY")
|
||||
@ApiParam("分解数量")
|
||||
private Double decomposeQty;
|
||||
|
||||
@Column(name="STATUS")
|
||||
@ApiParam("状态")
|
||||
private Integer status;
|
||||
|
||||
@Column(name="START_TIME")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@ApiParam("计划开始时间")
|
||||
private String startTime;
|
||||
|
||||
@Column(name="END_TIME")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@ApiParam("计划结束时间")
|
||||
private String endTime;
|
||||
|
||||
@Column(name="DELIVERY_DATE")
|
||||
@ApiParam("交货日期")
|
||||
private String deliveryDate;
|
||||
|
||||
@Column(name="CUST_CODE")
|
||||
@ApiParam("客户代码")
|
||||
private String custCode;
|
||||
|
||||
@Column(name="CUST_ORDER_NO")
|
||||
@ApiParam("客户订单号")
|
||||
private String custOrderNo;
|
||||
|
||||
@Column(name="SOURCE")
|
||||
@ApiParam("计划来源")
|
||||
private String source;
|
||||
|
||||
@Column(name="MEMO")
|
||||
@ApiParam("备注")
|
||||
private String memo;
|
||||
|
||||
@Column(name="WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
/********************** 冗余字段 *********************************/
|
||||
|
||||
@Transient
|
||||
@ApiParam(value="区域")
|
||||
public String areaCode;
|
||||
|
||||
@Transient
|
||||
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@ApiParam(value="创建日期查询用,查询结束日期",example = "2018-12-31 23:59:59")
|
||||
public String startTimeStart;
|
||||
|
||||
|
||||
@Transient
|
||||
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@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-12-31 23:59:59")
|
||||
public String endTimeStart;
|
||||
|
||||
@Transient
|
||||
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@ApiParam(value="计划结束日期查询用,查询结束日期",example = "2018-12-31 23:59:59")
|
||||
public String endTimeEnd;
|
||||
|
||||
public double getPlanQtyVal() {
|
||||
return this.planQty == null ? 0.0d : this.planQty;
|
||||
}
|
||||
|
||||
public double getDecomposeQtyVal() {
|
||||
return this.decomposeQty == null ? 0.0d : this.decomposeQty;
|
||||
}
|
||||
|
||||
public int getStatusVal() {
|
||||
return this.status == null ? 0 : this.status;
|
||||
}
|
||||
|
||||
public int getPlanTypeVal() {
|
||||
return this.planType == null ? 0 : this.planType;
|
||||
}
|
||||
}
|
@ -0,0 +1,42 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description :产品配置
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_PROD_CFG")
|
||||
@Api("产品配置")
|
||||
public class MesProdCfg extends BaseBean {
|
||||
@Column(name="PROD_CFG_CODE")
|
||||
@ApiParam("产品配置代码")
|
||||
private String prodCfgCode;
|
||||
|
||||
@Column(name="PROD_CFG_NAME")
|
||||
@ApiParam("产品配置名称")
|
||||
private String prodCfgName;
|
||||
|
||||
@Column(name="PROD_CFG_Type_CODE")
|
||||
@ApiParam("产品配置类型代码")
|
||||
private String prodCfgTypeCode;
|
||||
}
|
@ -0,0 +1,216 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: wangjie
|
||||
* @CreateDate:2019-09-19-17:36
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_WORK_ORDER_LOG")
|
||||
@Api("生产工单日志")
|
||||
public class MesWorkOrderLog extends BaseBean {
|
||||
@Column(name="ORDER_NO")
|
||||
@ApiParam("工单号")
|
||||
private String orderNo;
|
||||
|
||||
@Column(name="PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name="PART_NAME_RDD")
|
||||
@ApiParam("物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@Column(name="PROD_CFG_CODE")
|
||||
@ApiParam("产品配置代码")
|
||||
private String prodCfgCode;
|
||||
|
||||
@Column(name="QTY")
|
||||
@ApiParam("数量")
|
||||
private Double qty;
|
||||
|
||||
@Column(name="COMPLETE_QTY")
|
||||
@ApiParam("完成数量")
|
||||
private Double completeQty;
|
||||
|
||||
@Column(name="REPAIR_QTY")
|
||||
@ApiParam("返修数量")
|
||||
private Double repairQty;
|
||||
|
||||
@Column(name="SCRAP_QTY")
|
||||
@ApiParam("报废数量")
|
||||
private Double scrapQty;
|
||||
|
||||
@Column(name="SEQ")
|
||||
@ApiParam("工单序号")
|
||||
private Double seq;
|
||||
|
||||
@Column(name="WO_STATUS")
|
||||
@ApiParam("工单状态")
|
||||
private Integer workOrderStatus;
|
||||
|
||||
@Column(name="WO_TYPE")
|
||||
@ApiParam("工单类型")
|
||||
private Integer workOrderType;
|
||||
|
||||
@Column(name="NEXT_ORDER")
|
||||
@ApiParam("下一工单")
|
||||
private String nextOrder;
|
||||
|
||||
@Column(name="PLAN_ORDER_NO")
|
||||
@ApiParam("生产计划单号")
|
||||
private String planOrderNo;
|
||||
|
||||
@Column(name="WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name="AREA_CODE")
|
||||
@ApiParam("区域代码")
|
||||
private String areaCode;
|
||||
|
||||
@Column(name="WORK_CELL_CODE")
|
||||
@ApiParam("工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name="SCHEDULE_DATE")
|
||||
@ApiParam("排产日期")
|
||||
private String scheduleDate;
|
||||
|
||||
@Column(name="CUST_PROD_LINE_CODE")
|
||||
@ApiParam("客户产线代码")
|
||||
private String custProdLineCode;
|
||||
|
||||
@Column(name="SHIFT_CODE")
|
||||
@ApiParam("班次")
|
||||
private String shiftCode;
|
||||
|
||||
@Column(name="START_TIME")
|
||||
@ApiParam("开始时间")
|
||||
private String startTime;
|
||||
|
||||
@Column(name="END_TIME")
|
||||
@ApiParam("结束时间")
|
||||
private String endTime;
|
||||
|
||||
@Column(name="WO_SOURCE")
|
||||
@ApiParam("工单来源")
|
||||
private String workOrderSource;
|
||||
|
||||
@Column(name="MEMO")
|
||||
@ApiParam("备注")
|
||||
private String memo;
|
||||
|
||||
@Column(name="SHIFT_GROUP")
|
||||
@ApiParam("班组")
|
||||
private String shiftGroup;
|
||||
|
||||
@Column(name="APPROVAL_STATUS")
|
||||
@ApiParam("审批状态")
|
||||
private Integer approvalStatus;
|
||||
|
||||
@Column(name="CUST_CODE")
|
||||
@ApiParam("客户代码")
|
||||
private String custCode;
|
||||
|
||||
@Column(name="CUST_ORDER_NO")
|
||||
@ApiParam("客户订单号")
|
||||
private String custOrderNo;
|
||||
|
||||
/********************** 冗余字段 *********************************/
|
||||
@Transient
|
||||
@ApiParam(value="工作中心名称")
|
||||
public String workCenterName;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value="工作单元名称")
|
||||
public String workCellName;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value="客户产线名称")
|
||||
public String custProdLineName;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value="班次名称")
|
||||
public String shiftName;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value="班组名称")
|
||||
public String shiftGroupName;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value="产品配置名称")
|
||||
public String prodCfgName;
|
||||
|
||||
@Transient
|
||||
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@ApiParam(value="计划开始日期查询用,查询开始日期",example = "2018-12-31 23:59:59")
|
||||
public String startTimeStart;
|
||||
|
||||
|
||||
@Transient
|
||||
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@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-12-31 23:59:59")
|
||||
public String endTimeStart;
|
||||
|
||||
@Transient
|
||||
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@ApiParam(value="计划结束日期查询用,查询结束日期截至",example = "2018-12-31 23:59:59")
|
||||
public String endTimeEnd;
|
||||
|
||||
public double getQtyVal() {
|
||||
return this.qty == null ? 0.0d : this.qty;
|
||||
}
|
||||
|
||||
public double getCompleteQtyVal() {
|
||||
return this.completeQty == null ? 0.0d : this.completeQty;
|
||||
}
|
||||
|
||||
public double getRepairQtyVal() {
|
||||
return this.repairQty == null ? 0.0d : this.repairQty;
|
||||
}
|
||||
|
||||
public double getScrapQtyVal() {
|
||||
return this.scrapQty == null ? 0.0d : this.scrapQty;
|
||||
}
|
||||
|
||||
public double getSeqVal() {
|
||||
return this.seq == null ? 0.0d : this.seq;
|
||||
}
|
||||
|
||||
public int getWorkOrderStatusVal() {
|
||||
return this.workOrderStatus == null ? 0 : this.workOrderStatus;
|
||||
}
|
||||
|
||||
public int getWorkOrderTypeVal() {
|
||||
return this.workOrderType == null ? 0 : this.workOrderType;
|
||||
}
|
||||
|
||||
public int getApprovalStatusVal() {
|
||||
return this.approvalStatus == null ? 0 : this.approvalStatus;
|
||||
}
|
||||
}
|
@ -0,0 +1,69 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/8/23 11:42 AM
|
||||
* @Description:
|
||||
**/
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Api("生成条码模型")
|
||||
public class GenSerialNoModel {
|
||||
|
||||
@ApiParam("规则代码")
|
||||
private String ruleCode;
|
||||
|
||||
@ApiParam("规则描述")
|
||||
private String ruleDesc;
|
||||
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("客户物料号")
|
||||
private String custPartNo;
|
||||
|
||||
@ApiParam("客户代码")
|
||||
private String custCode;
|
||||
|
||||
@ApiParam("产地")
|
||||
private String prodLocation;
|
||||
|
||||
@ApiParam("前缀")
|
||||
private String prefix;
|
||||
|
||||
@ApiParam("编码规则")
|
||||
private String numberRule;
|
||||
|
||||
@ApiParam("序号长度")
|
||||
private Integer serialnoLength;
|
||||
|
||||
@ApiParam("增量")
|
||||
private Integer serialnoIncrement;
|
||||
|
||||
@ApiParam("最大值后循环")
|
||||
private Integer isCycle;
|
||||
|
||||
@ApiParam("当前编号前缀")
|
||||
private String currentNumberPrefix;
|
||||
|
||||
@ApiParam("当前序号")
|
||||
private Integer currentSerialno;
|
||||
|
||||
@ApiParam("当前编号")
|
||||
private String currentNumber;
|
||||
|
||||
|
||||
public GenSerialNoModel(String ruleCode){
|
||||
this.ruleCode=ruleCode;
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,39 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Author: wangjie
|
||||
* @CreateDate: 2019/8/21 9:19 AM
|
||||
* @Description:
|
||||
**/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Api("mes生产工单页面按钮控制model")
|
||||
public class MesWorkOrderButtonModel implements Serializable {
|
||||
|
||||
@ApiParam("修改按钮")
|
||||
private boolean updateButton;
|
||||
|
||||
@ApiParam("启动按钮")
|
||||
private boolean startUpButton;
|
||||
|
||||
@ApiParam("暂停按钮")
|
||||
private boolean suspendButton;
|
||||
|
||||
@ApiParam("取消按钮")
|
||||
private boolean revokeButton;
|
||||
|
||||
@ApiParam("关闭按钮")
|
||||
private boolean closeButton;
|
||||
|
||||
|
||||
}
|
@ -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.MesCustProdLine;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-04-19-11:15
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesCustProdLineRepository extends BaseRepository<MesCustProdLine, Long> {
|
||||
}
|
@ -0,0 +1,17 @@
|
||||
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.MesCustomer;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-04-22-16:12
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesCustomerRepository extends BaseRepository<MesCustomer, Long> {
|
||||
|
||||
}
|
@ -0,0 +1,15 @@
|
||||
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.MesNumberRule;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/8/23 1:22 PM
|
||||
* @Description:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesNumberRuleRepository extends BaseRepository<MesNumberRule, Long> {
|
||||
}
|
@ -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.MesNumberSerialno;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/8/23 1:23 PM
|
||||
* @Description:
|
||||
**/
|
||||
|
||||
@Repository
|
||||
public interface MesNumberSerialnoRepository extends BaseRepository<MesNumberSerialno, Long> {
|
||||
}
|
@ -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.MesPartCategory;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesPartCategoryRepository extends BaseRepository<MesPartCategory, Long> {
|
||||
}
|
@ -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.MesPlanOrder;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-04-17-17:08
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesPlanOrderRepository extends BaseRepository<MesPlanOrder, Long> {
|
||||
}
|
@ -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.MesProdCfg;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesProdCfgRepository extends BaseRepository<MesProdCfg, Long> {
|
||||
}
|
@ -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.MesShiftGroup;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: wangjie
|
||||
* @CreateDate:2019-09-18-17:13
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesShiftGroupRepository extends BaseRepository<MesShiftGroup, Long> {
|
||||
}
|
@ -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.MesWorkOrderLog;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: wangjie
|
||||
* @CreateDate:2019-09-19-17:13
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesWorkOrderLogRepository extends BaseRepository<MesWorkOrderLog, Long> {
|
||||
}
|
@ -0,0 +1,54 @@
|
||||
package cn.estsh.i3plus.pojo.softswitch.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;
|
||||
|
||||
/**
|
||||
* @Description : MQ 适配套件
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 2019/9/9 上午11:09
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "BS_SUIT_CASE_MQ")
|
||||
@Api(value = "MQ", description = "MQ 适配套件")
|
||||
public class BsSuitCaseMq extends BaseBean {
|
||||
|
||||
@Column(name = "SUIT_CASE_ID")
|
||||
@ApiParam(value = "套件id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long suitCaseId;
|
||||
|
||||
@Column(name = "USER_LOGIN_NAME")
|
||||
@ApiParam(value = "登录名称")
|
||||
private String userLoginName;
|
||||
|
||||
@Column(name = "USER_LOGIN_PWD")
|
||||
@ApiParam(value = "登录密码")
|
||||
private String userLoginPwd;
|
||||
|
||||
@Column(name = "VIRTUAL_HOST")
|
||||
@ApiParam(value = "虚拟 Host")
|
||||
private String virtualHost;
|
||||
|
||||
@Column(name = "QUEUE_NAME")
|
||||
@ApiParam(value = "队列名称")
|
||||
private String queueName;
|
||||
|
||||
}
|
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.softswitch.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseMq;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 2019/9/26 下午3:25
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface BsSuitCaseMqRepository extends BaseRepository<BsSuitCaseMq,Long> {
|
||||
}
|
@ -0,0 +1,51 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description : 物料关系表
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2019-09-27 14:44
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name="WMS_PART_RELATION")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api(value="物料关系表",description = "物料关系表")
|
||||
public class WmsPartRelation extends BaseBean {
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam(value = "物料编码")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam(value = "物料名称")
|
||||
private String partName;
|
||||
|
||||
@Column(name = "ASSOCIATE_CODE")
|
||||
@ApiParam(value = "关联代码")
|
||||
private String associateCode;
|
||||
|
||||
@Column(name = "ASSOCIATE_NAME_ADD")
|
||||
@ApiParam(value = "关联名称")
|
||||
private String associateNameAdd;
|
||||
|
||||
@Column(name = "ASSOCIATE_TYPE")
|
||||
@ApiParam(value = "关联类型")
|
||||
private Integer associateType;
|
||||
|
||||
}
|
@ -0,0 +1,59 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description : 打印机配置表
|
||||
* @Reference :
|
||||
* @Author : jessica.chen
|
||||
* @CreateDate : 2019-09-26 14:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="WMS_PRINTER_CONFIGURE")
|
||||
@Api("打印机配置表")
|
||||
public class WmsPrinterConfigure extends BaseBean{
|
||||
|
||||
private static final long serialVersionUID = 1234639813072592779L;
|
||||
@Column(name="PRINTER_NO")
|
||||
@ApiParam("打印机编号")
|
||||
private String printerNo;
|
||||
|
||||
@Column(name="PRINTER_NAME")
|
||||
@ApiParam("打印机名称")
|
||||
private String printerName;
|
||||
|
||||
@Column(name="IP")
|
||||
@ApiParam("IP")
|
||||
private String ip;
|
||||
|
||||
@Column(name="PORT")
|
||||
@ApiParam("端口")
|
||||
private Integer port;
|
||||
|
||||
@Column(name="OBJECT_DESCRIPTION")
|
||||
@ApiParam(value ="描述")
|
||||
private String objectDescription;
|
||||
|
||||
@Column(name="POSITION")
|
||||
@ApiParam("位置")
|
||||
private String position;
|
||||
|
||||
@Column(name="TYPE")
|
||||
@ApiParam("类型")
|
||||
private Integer type;
|
||||
}
|
@ -0,0 +1,55 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description : 待打印队列表
|
||||
* @Reference :
|
||||
* @Author : jessica.chen
|
||||
* @CreateDate : 2019-09-27 14:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="WMS_PRINTING_QUEUE")
|
||||
@Api("待打印队列表")
|
||||
public class WmsPrintingQueue extends BaseBean{
|
||||
|
||||
private static final long serialVersionUID = 1111639813072592779L;
|
||||
@Column(name="PRINT_IDENTIFICATION")
|
||||
@ApiParam("打印标识")
|
||||
private String printIdentification;
|
||||
|
||||
@Column(name="PRINT_TYPE")
|
||||
@ApiParam("打印类型")
|
||||
private Integer printType;
|
||||
|
||||
@Column(name="PRINT_NO")
|
||||
@ApiParam("打印机编号")
|
||||
private String printNo;
|
||||
|
||||
@Column(name="PRINT_MUMBER")
|
||||
@ApiParam("打印机张数")
|
||||
private Integer printNumber;
|
||||
|
||||
@Column(name="TEMPLATE_NO")
|
||||
@ApiParam("模板编号")
|
||||
private String templateNo;
|
||||
|
||||
@Column(name="PRINT_STATUS")
|
||||
@ApiParam("打印状态")
|
||||
private Integer printStatus;
|
||||
}
|
@ -0,0 +1,75 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description : 条码操作记录表
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2019-09-27 16:58
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name="WMS_SN_OPERATE_RECORD")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api(value="条码操作记录表",description = "条码操作记录表")
|
||||
public class WmsSnOperateRecord extends BaseBean {
|
||||
|
||||
@Column(name = "SN")
|
||||
@ApiParam(value = "条码")
|
||||
private String sn;
|
||||
|
||||
@Column(name = "LINE_CODE")
|
||||
@ApiParam(value = "产线代码")
|
||||
private String lineCode;
|
||||
|
||||
@Column(name = "ZONE_NO")
|
||||
@ApiParam(value = "存储区编号")
|
||||
private String zoneNo;
|
||||
|
||||
@Column(name = "LOCATE_NO")
|
||||
@ApiParam(value = "库位代码")
|
||||
private String locateNo;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam(value = "数量", example = "0")
|
||||
private Double qty = 0d;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam(value = "物料编号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME_RDD")
|
||||
@ApiParam(value = "物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@Column(name = "CUST_NO")
|
||||
@ApiParam(value = "客户编码")
|
||||
private String custNo;
|
||||
|
||||
@Column(name = "VENDOR_NO")
|
||||
@ApiParam(value = "供应商编码")
|
||||
public String vendorNo;
|
||||
|
||||
@Column(name = "SHIPPING_FLAG")
|
||||
@ApiParam(value = "发往地")
|
||||
private String shippingFlag;
|
||||
|
||||
@Column(name = "OPERATE_TYPE")
|
||||
@ApiParam(value = "操作类型")
|
||||
private Integer operateType;
|
||||
|
||||
}
|
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsPartRelation;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 物料关系信息
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2019-09-27 15:18
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsPartRelationRepository extends BaseRepository<WmsPartRelation, Long> {
|
||||
}
|
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsPrinterConfigure;
|
||||
|
||||
/**
|
||||
* @Description : 打印机配置
|
||||
* @Reference :
|
||||
* @Author : jessica.chen
|
||||
* @Date : 2019-09-26 12:03:00
|
||||
* @Modify :
|
||||
**/
|
||||
public interface WmsPrinterConfigureRepository extends BaseRepository<WmsPrinterConfigure, Long> {
|
||||
}
|
@ -0,0 +1,17 @@
|
||||
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.WmsPrintingQueue;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :待打印配置表
|
||||
* @Reference :
|
||||
* @Author : jessica.chen
|
||||
* @CreateDate : 2019-09-27 14:49
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsPrintingQueueRepository extends BaseRepository<WmsPrintingQueue, Long> {
|
||||
}
|
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsSnOperateRecord;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 条码操作记录信息
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2019-09-27 17:07
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsSnOperateRecordRepository extends BaseRepository<WmsSnOperateRecord, Long> {
|
||||
}
|
Loading…
Reference in New Issue