Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
commit
5c2dcf8e10
@ -0,0 +1,52 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EMaterialDeliveryPromise;
|
||||
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 javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description :物料交期承诺
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_MATERIAL_DELIVERY_PROMISE")
|
||||
@Api("物料")
|
||||
public class MaterialDeliveryPromise extends BaseBean {
|
||||
@Column(name="QTY")
|
||||
@ApiParam(value ="到货数量")
|
||||
private Double count;
|
||||
|
||||
@Column(name="DATE_TIME")
|
||||
@ApiParam(value ="到货日期")
|
||||
private Date dateTime;
|
||||
|
||||
@Column(name="MATERIAL_ID")
|
||||
@ApiParam(value ="物料")
|
||||
@FieldAnnotation(relation = "Material", notEmpty = true)
|
||||
private Long materialId;
|
||||
|
||||
public Material getMaterial() {
|
||||
return BeanRelation.get(this, EMaterialDeliveryPromise.Material);
|
||||
}
|
||||
|
||||
public void setMaterial(Material material) {
|
||||
this.materialId = material != null ? material.getId() : 0l;
|
||||
BeanRelation.set(this, EMaterialDeliveryPromise.Material, material);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EMaterialDeliveryPromise {
|
||||
Material,
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description : 物料交期分析表
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class MaterialDeliveryAnalyze {
|
||||
|
||||
private String orderCode;
|
||||
|
||||
private String orderName;
|
||||
|
||||
private String materialCode;
|
||||
|
||||
private String materialName;
|
||||
|
||||
private String labelName;
|
||||
|
||||
private String labelColor;
|
||||
|
||||
private Date requireDate;
|
||||
|
||||
private Date arrivalDate;
|
||||
|
||||
private Double requireCount;
|
||||
|
||||
private Double count;
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.MaterialDeliveryPromise;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface MaterialDeliveryPromiseRepository extends CrudRepository<MaterialDeliveryPromise, Long> {
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="MaterialDeliveryPromise">
|
||||
<Relation field="Material" name="Material" type="MULTI_TO_ONE">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -0,0 +1,54 @@
|
||||
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.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author wangjie
|
||||
* @date 2020/2/12 17:41
|
||||
* @desc
|
||||
*/
|
||||
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@Table(name = "IF_PICK_DATA")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("IF_拣货数据")
|
||||
public class IfPickData extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -1057633269490937118L;
|
||||
|
||||
@Column(name = "AREA_NO")
|
||||
@ApiParam("区域代码")
|
||||
private String areaNo;
|
||||
|
||||
@Column(name = "SECTION_NO")
|
||||
@ApiParam("区段编号")
|
||||
private String sectionNo;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料编号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("拣货数量")
|
||||
private Integer qty;
|
||||
|
||||
@Column(name = "SYNC_FLAG")
|
||||
@ApiParam("同步标识")
|
||||
private Integer syncFlag;
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package cn.estsh.i3plus.pojo.ptl.repository;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.ptl.bean.IfPickData;
|
||||
|
||||
/**
|
||||
* @author wangjie
|
||||
* @date 2020/2/12 17:41
|
||||
* @desc
|
||||
*/
|
||||
|
||||
public interface IfPickDataRepository extends BaseRepository<IfPickData, Long> {
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue