Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
wynne1005
5 years ago
commit
c8af9ed6f8
@ -0,0 +1,66 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesTooling;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Transient;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description : MES_设备工装关系Model
|
||||
* @Reference :
|
||||
* @Author :qianhuasheng
|
||||
* @CreateDate : 2020-04-02 16:34
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("MES_设备工装关系Model")
|
||||
public class MesEquipmentToolingModel implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1947971352179107711L;
|
||||
|
||||
private Long id;
|
||||
|
||||
@ApiParam("显示颜色")
|
||||
private String color;
|
||||
|
||||
@ApiParam("设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@ApiParam("工装编号")
|
||||
private String toolingNo;
|
||||
|
||||
@ApiParam("工装代码")
|
||||
private String toolingCode ;
|
||||
|
||||
@ApiParam("工装名称")
|
||||
private String toolingName;
|
||||
|
||||
@ApiParam("工装类型")
|
||||
private Integer toolingType;
|
||||
|
||||
@ApiParam("使用次数")
|
||||
private Integer useCount;
|
||||
|
||||
@ApiParam("更换开始时间")
|
||||
private String startTime;
|
||||
|
||||
@ApiParam("更换结束时间")
|
||||
private String endTime;
|
||||
|
||||
@Transient
|
||||
@ApiParam("最大次数")
|
||||
private Integer useCountMax;
|
||||
|
||||
public MesEquipmentToolingModel(MesTooling tooling, Integer useCount) {
|
||||
this.toolingCode = tooling.getToolingCode();
|
||||
this.toolingName = tooling.getToolingName();
|
||||
this.useCount = useCount;
|
||||
this.useCountMax = tooling.getUseCountMax();
|
||||
}
|
||||
public MesEquipmentToolingModel() {
|
||||
}
|
||||
}
|
||||
@ -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.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.*;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @Description : 运输规则表
|
||||
* @Reference :
|
||||
* @Author : puxiao.liao
|
||||
* @CreateDate : 2020-03-06 15:58
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_TRANSPORT_RULE")
|
||||
@Api("运输规则表")
|
||||
public class WmsTransportRule extends BaseBean {
|
||||
private static final long serialVersionUID = 6120257805546343124L;
|
||||
|
||||
@Column(name = "COMMAND_TYPE")
|
||||
@ApiParam(value = "指令类型")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.IMPORT_ORDER_TYPE.class, refForeignKey = "value", value = "description")
|
||||
private String commandType;
|
||||
|
||||
@Column(name = "BUSI_TYPE")
|
||||
@ApiParam("业务类型")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_MOVEMENT_BUSI_TYPE")
|
||||
public Integer busiType;
|
||||
|
||||
@Column(name = "BUSI_SCENE_TYPE")
|
||||
@ApiParam("业务场景")
|
||||
//@AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE")
|
||||
public Integer busiSceneType;
|
||||
|
||||
|
||||
@Column(name = "SRC_AREA_NO")
|
||||
@ApiParam("发货库存地")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
|
||||
public String srcAreaNo;
|
||||
|
||||
|
||||
@Column(name = "DEST_AREA_NO")
|
||||
@ApiParam("目标库存地")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
|
||||
public String destAreaNo;
|
||||
|
||||
@Column(name = "OUT_VENDOR_NO")
|
||||
@ApiParam("委外供应商编码")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
|
||||
public String outVendorNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料编码")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
|
||||
public String partNo;
|
||||
|
||||
@Column(name = "CUST_NO")
|
||||
@ApiParam("客户代码")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
|
||||
public String custNo;
|
||||
|
||||
@Column(name = "IS_TRANSPORT")
|
||||
@ApiParam("是否安排运输")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
|
||||
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
|
||||
public int isTransport;
|
||||
|
||||
@Column(name = "REMARK",length = 255)
|
||||
@ApiParam("备注")
|
||||
public String remark;
|
||||
|
||||
@ApiParam("物料编码")
|
||||
@Transient
|
||||
public List<String> partNoLst;
|
||||
}
|
||||
@ -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.WmsTransportRule;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 运输规则dao层
|
||||
* @Reference :
|
||||
* @Author : puxiao.liao
|
||||
* @CreateDate : 2020-03-27 10:30
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsTransportRuleRepository extends BaseRepository<WmsTransportRule, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue