Merge branch 'test' into ext-dev
# Conflicts: # modules/i3plus-pojo-screen/pom.xmlyun-zuoyi
gsz
4 years ago
commit
cb3b714a69
@ -0,0 +1,24 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 零件消耗数量模型
|
||||
* @Reference :
|
||||
* @Author : dominic
|
||||
* @CreateDate : 2021/7/1 14:40
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class PartConsumeCountModel {
|
||||
|
||||
@ApiParam("零件号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("消耗数量")
|
||||
private Integer consumeQty;
|
||||
|
||||
@ApiParam("需求数量")
|
||||
private Integer demandQty;
|
||||
}
|
||||
@ -0,0 +1,67 @@
|
||||
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 lombok.NoArgsConstructor;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.*;
|
||||
|
||||
/**
|
||||
* @Description : WmsECartOrderNoBuild
|
||||
* @Author :gsz
|
||||
* @Date 2021/7/5 19:06
|
||||
* @Modify
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name="WMS_ECARD_ORDERNO_BUILD")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Api(value="南非看板订单号",description = "南非看板订单号")
|
||||
@NoArgsConstructor
|
||||
public class WmsECartOrderNoBuild extends BaseBean {
|
||||
|
||||
private static final long serialVersionUID = 7332606009041273554L;
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam(value = "物料代码")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "CREATE_DATE")
|
||||
@ApiParam(value = "创建日期")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String createDate;
|
||||
|
||||
@Column(name = "SERIAL_NO")
|
||||
@ApiParam(value = "序列号")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
|
||||
private Integer serialNo;
|
||||
|
||||
@Column(name = "DEST_LOCATE_NO")
|
||||
@ApiParam(value = "目标库位")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String destLocateNo;
|
||||
|
||||
@Column(name = "SRC_ZONE_NO")
|
||||
@ApiParam(value = "源存储区")
|
||||
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
|
||||
private String srcZoneNo;
|
||||
|
||||
public WmsECartOrderNoBuild(String partNo, String createDate, Integer serialNo, String destLocateNo, String srcZoneNo) {
|
||||
this.partNo = partNo;
|
||||
this.createDate = createDate;
|
||||
this.serialNo = serialNo;
|
||||
this.destLocateNo = destLocateNo;
|
||||
this.srcZoneNo = srcZoneNo;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,67 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Index;
|
||||
import javax.persistence.Inheritance;
|
||||
import javax.persistence.InheritanceType;
|
||||
import javax.persistence.Table;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
/**
|
||||
* @Description : ERP fgDetail表
|
||||
* @Reference :
|
||||
* @Author : junsheng.li
|
||||
* @CreateDate 2021/7/5 9:31
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Table(name = "WMS_ERP_FG_DETAILS_SNAPSHOT", indexes = {@Index(columnList = "PART_NO"), @Index(columnList = "AREA_NO"), @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "SNAPSHOT_TIME")})
|
||||
public class WmsErpFgDetailsSnapshot extends BaseBean {
|
||||
private static final long serialVersionUID = -4095444692227226944L;
|
||||
|
||||
@Column(name = "SNAPSHOT_TIME")
|
||||
@ApiParam("快照时间")
|
||||
public String snapshotTime;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("零件号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "AREA_NO")
|
||||
@ApiParam("库存地点")
|
||||
private String areaNo;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("数量")
|
||||
private Double qty;
|
||||
|
||||
@Column(name = "UNIT")
|
||||
@ApiParam("单位")
|
||||
private String unit;
|
||||
|
||||
@Column(name = "ITEM_PART_NO")
|
||||
@ApiParam("子零件号")
|
||||
private String itemPartNo;
|
||||
|
||||
@Column(name = "VIN_CODE")
|
||||
@ApiParam("vin号")
|
||||
private String vinCode;
|
||||
|
||||
@Column(name = "ITEM_PART_QTY")
|
||||
@ApiParam("子零件数量")
|
||||
private Double itemPartQty;
|
||||
|
||||
@ApiParam("存储区")
|
||||
private String zoneNo;
|
||||
}
|
||||
@ -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.snapshot.erp.WmsErpFgDetailsSnapshot;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description : 库存信息快照
|
||||
* @Reference :
|
||||
* @author: amy.liu
|
||||
* @date: 2019/9/19 14:22
|
||||
* @Modify:
|
||||
*/
|
||||
|
||||
@Repository
|
||||
public interface IWmsErpFgDetailsRepository extends BaseRepository<WmsErpFgDetailsSnapshot,Long> {
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsECartOrderNoBuild;
|
||||
|
||||
/**
|
||||
* @Description : WmsECartOrderNoBuildRepository
|
||||
* @Author :gsz
|
||||
* @Date 2021/7/6 9:56
|
||||
* @Modify
|
||||
**/
|
||||
public interface WmsECartOrderNoBuildRepository extends BaseRepository<WmsECartOrderNoBuild, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue