Merge remote-tracking branch 'origin/dev' into dev
commit
52f3758cee
@ -0,0 +1,58 @@
|
||||
package cn.estsh.i3plus.pojo.andon.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
|
||||
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 java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description : ANDON_上升流程配置
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 9:53
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name="ANDON_RITE_ROUTE")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("ANDON_上升流程配置")
|
||||
public class AndonRiteRoute extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 5542314911937418047L;
|
||||
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
|
||||
@Column(name = "ALARM_CODE")
|
||||
@ApiParam(value = "安灯类型")
|
||||
private String alarmCode;
|
||||
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description")
|
||||
@Column(name = "ANDON_STATUS")
|
||||
@ApiParam(value = "安灯状态")
|
||||
private String andonStatus;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam(value = "工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "MEMO")
|
||||
@ApiParam(value = "备注")
|
||||
private String memo;
|
||||
|
||||
@AnnoOutputColumn(hidden = true)
|
||||
@Column(name = "WORK_CENTER_NAME_RDD")
|
||||
@ApiParam(value = "工作中心名称")
|
||||
private String workCenterNameRdd;
|
||||
}
|
||||
@ -0,0 +1,58 @@
|
||||
package cn.estsh.i3plus.pojo.andon.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
|
||||
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 java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description : ANDON_上升配置明细
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 9:53
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name="ANDON_RITE_ROUTE_DETAIL")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("ANDON_上升配置明细")
|
||||
public class AndonRiteRouteDetail extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 8382210828244626428L;
|
||||
|
||||
@Column(name = "RITE_ROUTE_ID")
|
||||
@ApiParam(value = "上升流程配置ID")
|
||||
private Long riteRouteId;
|
||||
|
||||
@Column(name = "RP_WHERE")
|
||||
@ApiParam(value = "通知时间")
|
||||
private String rpWhere;
|
||||
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
|
||||
@Column(name = "RP_CODE")
|
||||
@ApiParam(value = "通知方式代码")
|
||||
private String rpCode;
|
||||
|
||||
@Column(name = "RP_OBJECT_CODE")
|
||||
@ApiParam(value = "通知对象")
|
||||
private String rpObjectCode;
|
||||
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description")
|
||||
@Column(name = "RP_LEVEL")
|
||||
@ApiParam(value = "通知级别")
|
||||
private String rpLevel;
|
||||
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package cn.estsh.i3plus.pojo.andon.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRouteModuleParam;
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 流程明细Model
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2020-04-10 13:27
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("流程明细Model")
|
||||
public class AndonActionModuleGroupModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 2483914575357867288L;
|
||||
|
||||
@ApiParam("组件代码")
|
||||
private String amCode;
|
||||
|
||||
@ApiParam("执行顺序")
|
||||
private Integer seq;
|
||||
|
||||
@ApiParam("流程组件参数集合")
|
||||
private List<AndonRouteModuleParam> routeModuleParamList;
|
||||
|
||||
@ApiParam("区域流程组件参数集合")
|
||||
private List<AndonAlarmRouteModuleParam> alarmRouteModuleParamList;
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package cn.estsh.i3plus.pojo.andon.model;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 作业流程Model
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2020-04-10 13:27
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("作业流程Model")
|
||||
public class AndonBussinessProcessModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 801986911134685985L;
|
||||
|
||||
@ApiParam("流程代码")
|
||||
private String routeCode;
|
||||
|
||||
@ApiParam("GOJS位置")
|
||||
private String position;
|
||||
|
||||
@ApiParam("流程明细Model集合")
|
||||
private List<AndonProcessDetailModel> processDetailModelList;
|
||||
|
||||
@ApiParam("安灯流程ID")
|
||||
private Long alarmRouteId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package cn.estsh.i3plus.pojo.andon.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description: 上升配置明细model
|
||||
* @Reference:
|
||||
* @Author: wangjie
|
||||
* @CreateDate:2019-11-12-10:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class AndonRiteRouteDetailModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1993963582174708808L;
|
||||
|
||||
@ApiParam(value = "安灯类型")
|
||||
private String alarmCode;
|
||||
|
||||
@ApiParam(value = "安灯状态")
|
||||
private String andonStatus;
|
||||
|
||||
@ApiParam(value = "工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam(value = "备注")
|
||||
private String memo;
|
||||
|
||||
@ApiParam(value = "工作中心名称")
|
||||
private String workCenterNameRdd;
|
||||
|
||||
@ApiParam(value = "上升流程配置ID")
|
||||
private Long riteRouteId;
|
||||
|
||||
@ApiParam(value = "通知时间")
|
||||
private String rpWhere;
|
||||
|
||||
@ApiParam(value = "通知方式代码")
|
||||
private String rpCode;
|
||||
|
||||
@ApiParam(value = "通知对象")
|
||||
private String rpObjectCode;
|
||||
|
||||
@ApiParam(value = "通知级别")
|
||||
private String rpLevel;
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleGroup;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 11:07
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonActionModuleGroupRepository extends BaseRepository<AndonActionModuleGroup, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 11:07
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonActionRouteRepository extends BaseRepository<AndonActionRoute, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 11:07
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonAlarmRouteRepository extends BaseRepository<AndonAlarmRoute, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonRiteRouteDetailRepository extends BaseRepository<AndonRiteRouteDetail, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonRiteRouteRepository extends BaseRepository<AndonRiteRoute, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-05-13 11:07
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonRouteModuleParamRepository extends BaseRepository<AndonRouteModuleParam, Long> {
|
||||
}
|
||||
@ -0,0 +1,62 @@
|
||||
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.*;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : joke
|
||||
* @CreateDate : 2020-03-06 10:01 上午
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Builder
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM")
|
||||
@Api("客户JIT生产队列散件清单")
|
||||
public class MesQueueJitActualBom extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 1604529847020812472L;
|
||||
|
||||
@Column(name = "JIS_ACTUAL_NO")
|
||||
@ApiParam("队列编号")
|
||||
private String jisActualNo;
|
||||
|
||||
@Column(name = "ASSY_NO")
|
||||
@ApiParam("组件编号")
|
||||
private String assyNo;
|
||||
|
||||
@Column(name = "PRODUCE_CTGY_CODE")
|
||||
@ApiParam("产品位置代码")
|
||||
private String produceCtgyCode;
|
||||
|
||||
@Column(name = "CUST_PART_NO")
|
||||
@ApiParam("客户物料号")
|
||||
private String custPartNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("用量")
|
||||
private Double qty = 0d;
|
||||
|
||||
@Column(name = "PART_COLOR_VALUE")
|
||||
@ApiParam("零件色值")
|
||||
private String partColorValue;
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
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;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: jessica.chen
|
||||
* @CreateDate: 2019\11\15 10:01
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_QUEUE_ORDER_BOM")
|
||||
@Api("MES_生产队列散件清单")
|
||||
public class MesQueueOrderBom extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -5412635747424111476L;
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("主队列编号")
|
||||
private String orderNo;
|
||||
|
||||
@Column(name = "VIN_CODE")
|
||||
@ApiParam("Vin")
|
||||
private String vinCode;
|
||||
|
||||
@Column(name = "ASSY_NO")
|
||||
@ApiParam("组件编号")
|
||||
private String assyNo;
|
||||
|
||||
@Column(name = "PRODUCE_CTGY_CODE")
|
||||
@ApiParam("产品位置代码")
|
||||
private String produceCtgyCode;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("用量")
|
||||
private Double qty = 0d;
|
||||
|
||||
@Column(name = "COLOR_CODE")
|
||||
@ApiParam("颜色代码")
|
||||
private String colorCode;
|
||||
}
|
||||
@ -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.MesQueueJitActualBom;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/5/21 20:17
|
||||
* @desc
|
||||
*/
|
||||
@Repository
|
||||
public interface MesQueueJitActualBomRepository extends BaseRepository<MesQueueJitActualBom, Long> {
|
||||
}
|
||||
@ -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.MesQueueOrderBom;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\18 10:34
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesQueueOrderBomRepository extends BaseRepository<MesQueueOrderBom, Long> {
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
|
||||
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;
|
||||
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 : BH检测大类表
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-05-23
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "QMS_CHECK_TYPE")
|
||||
@Api("物料子检测项")
|
||||
public class QmsCheckType extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = -4867744538301370899L;
|
||||
|
||||
@Column(name = "CHECK_TYPE_CODE")
|
||||
@ApiParam("检测大类代码")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
|
||||
private String checkTypeCode;
|
||||
|
||||
@Column(name = "CHECK_TYPE_NAME")
|
||||
@ApiParam("检测大类名称")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
|
||||
private String checkTypeName;
|
||||
|
||||
@Column(name = "REMARK")
|
||||
@ApiParam("备注")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
|
||||
private String remark;
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
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;
|
||||
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 : BH库存条码扩展表
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2020-05-22 13:22
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="QMS_STOCK_SN_EXT_BH")
|
||||
@Api("BH检测大类表")
|
||||
public class QmsStockSnExtBh extends BaseBean {
|
||||
|
||||
@Column(name="sn")
|
||||
@ApiParam("条码")
|
||||
private String sn;
|
||||
|
||||
@Column(name="BATCH_NO")
|
||||
@ApiParam("BATCH号")
|
||||
private String batchNo;
|
||||
|
||||
@Column(name="BH_TYPE")
|
||||
@ApiParam("BH类型")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
|
||||
private Integer bhType;
|
||||
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
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.ColumnDefault;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description : 产品条码信息
|
||||
* @Reference :
|
||||
* @Author : puxiao.liao
|
||||
* @CreateDate : 2020-05-23 11:00
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name = "WMS_SERIAL_SN", indexes = {
|
||||
@Index(columnList = "BATCH_NO"),
|
||||
@Index(columnList = "STOCK_SN"),
|
||||
@Index(columnList = "PART_NO"),
|
||||
@Index(columnList = "SERIAL_SN")
|
||||
})
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api(value = "产品条码信息", description = "产品条码信息")
|
||||
public class WmsSerialSn extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = -2540413299274882785L;
|
||||
|
||||
@Column(name = "BATCH_NO")
|
||||
@ApiParam(value = "BATCH号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String batchNo;
|
||||
|
||||
@Column(name = "STOCK_SN")
|
||||
@ApiParam(value = "库存条码")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String stockSn;
|
||||
|
||||
@Column(name = "SERIAL_SN")
|
||||
@ApiParam(value = "产品条码")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String serialSn;
|
||||
|
||||
@Column(name = "SRC_STOCK_SN")
|
||||
@ApiParam(value = "源库存条码")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String srcStockSn;
|
||||
|
||||
@Column(name = "BH_TYPE")
|
||||
@ApiParam(value = "BH类型")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE")
|
||||
private Integer bhType;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam(value = "物料编号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
|
||||
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
|
||||
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME_RDD")
|
||||
@ApiParam(value = "物料名称")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
|
||||
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
|
||||
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
|
||||
private String partNameRdd;
|
||||
|
||||
|
||||
@Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "数量", example = "0")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
|
||||
private Double qty;
|
||||
}
|
||||
@ -0,0 +1,103 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
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;
|
||||
import javax.persistence.Transient;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 产品条码事务表
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2020-05-22 9:42
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="WMS_SERIAL_SN_TRANS")
|
||||
@Api("产品条码事务表")
|
||||
public class WmsSerialSnTrans extends BaseBean {
|
||||
|
||||
@Column(name = "BATCH_NO")
|
||||
@ApiParam(value = "BATCH号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String batchNo;
|
||||
|
||||
@Column(name="SERIAL_SN")
|
||||
@ApiParam("产品条码")
|
||||
private String serialSn;
|
||||
|
||||
@Column(name="BH_TYPE")
|
||||
@ApiParam("BH类型")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description")
|
||||
private Integer bhType;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam(value = "物料编号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
|
||||
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
|
||||
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME_RDD")
|
||||
@ApiParam(value = "物料名称")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
|
||||
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
|
||||
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
|
||||
private String partNameRdd;
|
||||
|
||||
@Column(name="SRC_STOCK_SN")
|
||||
@ApiParam("源库存条码")
|
||||
private String srcStockSn;
|
||||
|
||||
@Column(name="DEST_STOCK_SN")
|
||||
@ApiParam("目标库存条码")
|
||||
private String destStockSn;
|
||||
|
||||
@Column(name="TRANS_TYPE")
|
||||
@ApiParam("操作类型")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BACTH_TRANS_TYPE")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description")
|
||||
private Integer transType;
|
||||
|
||||
@Column(name = "IS_OK")
|
||||
@ApiParam(value = "是否合格")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
|
||||
private Integer isOk;
|
||||
|
||||
@Transient
|
||||
@ApiParam("操作类型")
|
||||
private List<Integer> transTypeLst;
|
||||
|
||||
public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) {
|
||||
this.organizeCode = wmsSerialSn.getOrganizeCode();
|
||||
this.batchNo = wmsSerialSn.getBatchNo();
|
||||
this.serialSn = wmsSerialSn.getSerialSn();
|
||||
this.bhType = wmsSerialSn.getBhType();
|
||||
this.partNo = wmsSerialSn.getPartNo();
|
||||
this.partNameRdd = wmsSerialSn.getPartNameRdd();
|
||||
this.destStockSn = wmsSerialSn.getStockSn();
|
||||
this.transType = transType;
|
||||
}
|
||||
|
||||
public WmsSerialSnTrans() {
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.QmsCheckType;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface QmsCheckTypeRepository extends BaseRepository<QmsCheckType, Long> {
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.QmsStockSnExtBh;
|
||||
|
||||
/**
|
||||
* @Description : BH库存条码扩展表
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2020-05-22 13:24
|
||||
* @Modify:
|
||||
**/
|
||||
public interface QmsStockSnExtBhRepository extends BaseRepository<QmsStockSnExtBh,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.WmsSerialSn;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 产品条码信息dao层
|
||||
* @Reference :
|
||||
* @Author : puxiao.liao
|
||||
* @CreateDate : 2020-05-23 11:00
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsSerialSnRepository extends BaseRepository<WmsSerialSn, 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.WmsSerialSnTrans;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 产品条码事务表
|
||||
* @Reference :
|
||||
* @Author : jimmy.zeng
|
||||
* @CreateDate : 2020-05-22 9:43
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsSerialSnTransRepository extends BaseRepository<WmsSerialSnTrans,Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue