Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
汪云昊
6 years ago
commit
03d432993a
@ -0,0 +1,62 @@
|
||||
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.ColumnDefault;
|
||||
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 : jessica.chen
|
||||
* @CreateDate : 2019-11-09 14:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_PP_DETAILS")
|
||||
@Api("MES_生产计划明细表")
|
||||
public class MesPpDetails extends BaseBean{
|
||||
|
||||
private static final long serialVersionUID = 9214639813072592727L;
|
||||
|
||||
@Column(name="WROKORDER_NO")
|
||||
@ApiParam("工单号")
|
||||
private String woekorderNo;
|
||||
|
||||
@Column(name="ITEM")
|
||||
@ApiParam("行号")
|
||||
private Integer item;
|
||||
|
||||
@Column(name="PART_NO")
|
||||
@ApiParam("零件号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name="PART_NAME_RDD")
|
||||
@ApiParam("零件名称")
|
||||
private String partNameRdd;
|
||||
|
||||
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
|
||||
@ColumnDefault("0")
|
||||
@ApiParam(value = "工单数量", example = "0")
|
||||
public Double qty;
|
||||
|
||||
public Integer getItem() {
|
||||
return item == null ? 0 : this.item.intValue();
|
||||
}
|
||||
|
||||
public Double getQty() {
|
||||
return qty == null ? 0D : this.qty.doubleValue();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
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 : MES_生产计划主表
|
||||
* @Reference :
|
||||
* @Author : jessica.chen
|
||||
* @CreateDate : 2019-11-09 14:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_PP_MASTER")
|
||||
@Api("MES_生产计划主表")
|
||||
public class MesPpMaster extends BaseBean{
|
||||
|
||||
private static final long serialVersionUID = 9214639813072592726L;
|
||||
|
||||
@Column(name="WROKORDER_NO")
|
||||
@ApiParam("工单号")
|
||||
private String woekorderNo;
|
||||
|
||||
@Column(name="PDLINE_NO")
|
||||
@ApiParam("产线代码")
|
||||
private String pdlineNo;
|
||||
|
||||
@Column(name="PLAN_PRODUCT_TIME")
|
||||
@ApiParam("生产日期")
|
||||
private String planProductTime;
|
||||
|
||||
@Column(name="SHIFT_NO")
|
||||
@ApiParam("班次代码")
|
||||
private String shitNo;
|
||||
|
||||
@Column(name="START_PRODUCT_TIME")
|
||||
@ApiParam("开始生产时间")
|
||||
private String startProductTime;
|
||||
|
||||
@Column(name="END_PRODUCT_TIME")
|
||||
@ApiParam("结束生产时间")
|
||||
private String endProductTime;
|
||||
|
||||
@Column(name="ORDER_STATUS")
|
||||
@ApiParam(value = "单据状态", example = "0")
|
||||
private Integer orderStatus = 0;
|
||||
|
||||
public Integer getOrderStatus() {
|
||||
return orderStatus == null ? 0 : this.orderStatus.intValue();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,58 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 生产计划模板
|
||||
* @Reference :
|
||||
* @author: jessica.chen
|
||||
* @date: 2019/12/10 17:10
|
||||
* @Modify:
|
||||
*/
|
||||
|
||||
@Data
|
||||
@Api(value="生产计划模板",description = "生产计划模板")
|
||||
public class MesPpTemplate extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = 2167743108452607913L;
|
||||
|
||||
@ApiParam(value = "工单号")
|
||||
@AnnoOutputColumn
|
||||
private String woekorderNo;
|
||||
|
||||
@ApiParam(value = "产线代码")
|
||||
@AnnoOutputColumn
|
||||
private String pdlineNo;
|
||||
|
||||
@ApiParam(value = "生产日期")
|
||||
@AnnoOutputColumn
|
||||
private String planProductTime;
|
||||
|
||||
@ApiParam(value = "班次代码")
|
||||
@AnnoOutputColumn
|
||||
private String shitNo;
|
||||
|
||||
@ApiParam(value = "开始生产时间")
|
||||
@AnnoOutputColumn
|
||||
private String startProductTime;
|
||||
|
||||
@ApiParam(value = "结束生产时间")
|
||||
@AnnoOutputColumn
|
||||
private String endProductTime;
|
||||
|
||||
@ApiParam(value = "零件号")
|
||||
@AnnoOutputColumn
|
||||
private String partNo;
|
||||
|
||||
@ApiParam(value = "零件描述")
|
||||
@AnnoOutputColumn
|
||||
private String partNameRdd;
|
||||
|
||||
@ApiParam(value = "工单数量")
|
||||
@AnnoOutputColumn
|
||||
private Double qty;
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
package cn.estsh.i3plus.pojo.wms.dto;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Transient;
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class WmsCarDto implements Serializable {
|
||||
|
||||
@Column(name="CAR_NO")
|
||||
@ApiParam(value ="车牌号")
|
||||
private String carNo;
|
||||
|
||||
@Column(name="CAR_DESC")
|
||||
@ApiParam(value ="车辆描述")
|
||||
private String carDesc;
|
||||
|
||||
@Column(name="MAX_CAPACITY")
|
||||
@ApiParam(value ="载重量(KG)")
|
||||
private String maxCapacity;
|
||||
|
||||
@Column(name="DRIVER_NO")
|
||||
@ApiParam(value ="默认驾驶员")
|
||||
private String driverNo;
|
||||
|
||||
@Column(name="PHONE")
|
||||
@ApiParam(value ="车主电话")
|
||||
private String phone;
|
||||
|
||||
@Column(name="VENDOR_NO")
|
||||
@ApiParam(value ="所属供应商")
|
||||
private String vendorNo;
|
||||
|
||||
@Transient
|
||||
@ApiParam("司机名称")
|
||||
private String driverNameRdd;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "供应商名称")
|
||||
private String vendorNameRdd;
|
||||
|
||||
@ApiParam(value = "是否删除，默认否")
|
||||
private Integer isDeleted = 2;
|
||||
|
||||
@ApiParam("是否有效，默认是")
|
||||
private Integer isValid = 1;
|
||||
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package cn.estsh.i3plus.pojo.wms.dto;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class WmsTmsDriverDto implements Serializable {
|
||||
|
||||
@Column(name="DRIVER_NO")
|
||||
@ApiParam(value ="驾驶员编号")
|
||||
private String driverNo;
|
||||
|
||||
@Column(name="DRIVER_NAME")
|
||||
@ApiParam(value ="驾驶员姓名")
|
||||
private String driverName;
|
||||
|
||||
@Column(name="SEX")
|
||||
@ApiParam(value ="驾驶员性别")
|
||||
private Integer sex;
|
||||
|
||||
@Column(name="AGE")
|
||||
@ApiParam(value ="驾驶员年龄")
|
||||
private String age;
|
||||
|
||||
@Column(name="ID_NO")
|
||||
@ApiParam(value ="驾驶员身份证号")
|
||||
private String idNo;
|
||||
|
||||
@Column(name="ADRESS")
|
||||
@ApiParam(value ="驾驶员籍贯")
|
||||
private String adress;
|
||||
|
||||
@Column(name="PHONE")
|
||||
@ApiParam(value ="车牌号")
|
||||
private String phone;
|
||||
|
||||
@Column(name="LOGIN_NO")
|
||||
@ApiParam(value =" 登录账号")
|
||||
private String loginNo;
|
||||
|
||||
@ApiParam("是否删除，默认否")
|
||||
private Integer isDeleted = 2;
|
||||
|
||||
@ApiParam("是否有效，默认是")
|
||||
private Integer isValid = 1;
|
||||
}
|
||||
@ -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.MesPpDetails;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :MES_生产计划明细表
|
||||
* @Reference :
|
||||
* @Author : jessica,chen
|
||||
* @CreateDate : 2019-11-27 14:49
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesPpDetailsRepository extends BaseRepository<MesPpDetails, 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.MesPpMaster;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsFile;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :MES_生产计划主表
|
||||
* @Reference :
|
||||
* @Author : jessica,chen
|
||||
* @CreateDate : 2019-11-27 14:49
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesPpMasterRepository extends BaseRepository<MesPpMaster, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue