【合并冲突】
陈思洁
5 years ago
commit
dda5a4c7e9
@ -0,0 +1,67 @@
|
||||
package cn.estsh.i3plus.pojo.mes.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;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/5/28 14:32
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PRODUCE_ERROR_RECORD")
|
||||
@Api("生产异常操作记录")
|
||||
public class MesProduceErrorRecord extends BaseBean {
|
||||
private static final long serialVersionUID = 209753108845613052L;
|
||||
|
||||
@Column(name = "ERROR_TYPE")
|
||||
@ApiParam("异常类型 10:工序跳过 20:工步跳过")
|
||||
private Integer errorType;
|
||||
|
||||
@Column(name = "SERIAL_NUMBER")
|
||||
@ApiParam("过程条码")
|
||||
private String serialNumber;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME_RDD")
|
||||
@ApiParam("物料名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("产线代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工位代码")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "PROCESS_CODE")
|
||||
@ApiParam("工序代码")
|
||||
private String processCode;
|
||||
|
||||
@Column(name = "STEP_CODE")
|
||||
@ApiParam("工步代码")
|
||||
private String stepCode;
|
||||
|
||||
@Column(name = "STATUS_CODE")
|
||||
@ApiParam("状态点代码")
|
||||
private String statusCode;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesProduceErrorRecord;
|
||||
|
||||
/**
|
||||
* @Description :IF_JIT发运数据
|
||||
* @Reference :
|
||||
* @Author : qianhuasheng
|
||||
* @CreateDate : 2020-03-06 10:57 上午
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesProduceErrorRecordRepository extends BaseRepository<MesProduceErrorRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,64 @@
|
||||
package cn.estsh.i3plus.pojo.ptl.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.Lob;
|
||||
import javax.persistence.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author wangjie
|
||||
* @date 2020/2/12 17:41
|
||||
* @desc
|
||||
*/
|
||||
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@Table(name = "PTL_ROUTE_STATUS_ERROR_RECORD")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("流程状态异常记录")
|
||||
public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 4507582337334278877L;
|
||||
|
||||
@Column(name = "ROUTE_CODE")
|
||||
@ApiParam("流程代码")
|
||||
private String routeCode;
|
||||
|
||||
@Column(name = "STATUS_CODE")
|
||||
@ApiParam("状态代码")
|
||||
private String statusCode;
|
||||
|
||||
@Column(name = "TASK_NO")
|
||||
@ApiParam("主任务编号")
|
||||
private String taskNo;
|
||||
|
||||
@Column(name = "ERROR_DESC")
|
||||
@ApiParam(value = "失败描述")
|
||||
public String errorDesc;
|
||||
|
||||
@Column(name = "AREA_NO")
|
||||
@ApiParam("区域代码")
|
||||
private String areaNo;
|
||||
|
||||
@Column(name = "CACHE_FLAG")
|
||||
@ApiParam(value = "缓存标识")
|
||||
private Integer cacheFlag;
|
||||
|
||||
@Lob
|
||||
@Column(name = "CONTENT")
|
||||
@ApiParam(value = "内容")
|
||||
private String content;
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.ptl.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatusErrorRecord;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface PtlRouteStatusErrorRecordRepository extends BaseRepository<PtlRouteStatusErrorRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,48 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.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;
|
||||
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 : jason.niu
|
||||
* @CreateDate : 2020-05-28
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_MOVEMENT_TO_SWEB")
|
||||
@Api("库存移动单处理成功后的记录")
|
||||
public class WmsMovementToSweb extends BaseBean {
|
||||
private static final long serialVersionUID = 49215041475324487L;
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("单号")
|
||||
public String orderNo;
|
||||
|
||||
/**
|
||||
* 状态:1=创建,10=待处理,20=已处理
|
||||
*/
|
||||
@Column(name="ITEM_STATUS")
|
||||
@ApiParam(value = "状态", example = "0")
|
||||
public Integer itemStatus;
|
||||
|
||||
@Column(name = "SYNC_STATUS")
|
||||
@ApiParam("同步状态")
|
||||
private Integer syncStatus;
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.SwebMovementToWms;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface SwebMovementToWmsRepository extends BaseRepository<SwebMovementToWms, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.SwebPoToWms;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface SwebPoToWmsRepository extends BaseRepository<SwebPoToWms, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.WmsMovementToSweb;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface WmsMovementToSwebRepository extends BaseRepository<WmsMovementToSweb, Long> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.sweb.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.sweb.bean.WmsPoToSweb;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface WmsPoToSwebRepository extends BaseRepository<WmsPoToSweb, Long> {
|
||||
}
|
||||
@ -1,86 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean.sweb;
|
||||
|
||||
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;
|
||||
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 : jason.niu
|
||||
* @CreateDate : 2020-05-28
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_PO_TO_WMS")
|
||||
@Api("库存移动单处理成功后的记录")
|
||||
public class WmsMovementToSweb extends BaseBean {
|
||||
private static final long serialVersionUID = 49215041475324487L;
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("单号")
|
||||
public String orderNo;
|
||||
|
||||
@Column(name = "ITEM")
|
||||
@ApiParam("行号")
|
||||
public String item;
|
||||
|
||||
@Column(name = "SRC_WH_NO")
|
||||
@ApiParam("源仓库代码")
|
||||
public String srcWhNo;
|
||||
|
||||
@Column(name = "DEST_ZONE_NO")
|
||||
@ApiParam("目标存储区代码")
|
||||
public String destZoneNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料编码")
|
||||
public String partNo;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@Column(name = "UNIT")
|
||||
@ApiParam("单位")
|
||||
public String unit;
|
||||
|
||||
/**
|
||||
* 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
|
||||
* VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
|
||||
* MI=移库入库,MO=移库出库,SO=发运
|
||||
*/
|
||||
@Column(name = "BUSI_TYPE")
|
||||
@ApiParam("业务类型")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
|
||||
public Integer busiType;
|
||||
|
||||
@Column(name = "PLAN_DATE")
|
||||
@ApiParam(value = "计划日期")
|
||||
private String planDate;
|
||||
|
||||
@Column(name = "PLAN_TIME")
|
||||
@ApiParam(value = "计划时间")
|
||||
private String planTime;
|
||||
|
||||
/**
|
||||
* 状态:1=创建,10=待处理,20=已处理
|
||||
*/
|
||||
@Column(name="ITEM_STATUS")
|
||||
@ApiParam(value = "状态", example = "0")
|
||||
public Integer itemStatus;
|
||||
}
|
||||
Loading…
Reference in New Issue