合并冲突
commit
31e24390dd
@ -0,0 +1,51 @@
|
||||
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.ColumnDefault;
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description :容器类型
|
||||
* @Reference :
|
||||
* @Author : gcj
|
||||
* @CreateDate : 2019-11-07 16:06
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_CONTAINER_TYPE")
|
||||
@Api("容器类型")
|
||||
public class WmsContainerType extends BaseBean {
|
||||
private static final long serialVersionUID = 4849044986767609347L;
|
||||
@Column(name = "CT_CODE",unique = true)
|
||||
@ApiParam(value = "容器类型代码")
|
||||
private String ctCode;
|
||||
|
||||
@Column(name = "CT_NAME")
|
||||
@ApiParam(value = "容器类型名称")
|
||||
private String ctName;
|
||||
|
||||
@Column(name = "USE_LIMIT")
|
||||
@ApiParam(value = "使用期限")
|
||||
private Integer useLimit;
|
||||
|
||||
@Column(name = "IS_RECYCLE")
|
||||
@ApiParam(value = "是否回收")
|
||||
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
|
||||
private Integer isRecycle;
|
||||
}
|
@ -0,0 +1,64 @@
|
||||
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;
|
||||
import javax.persistence.Transient;
|
||||
|
||||
/**
|
||||
* @Description :容器类型
|
||||
* @Reference :
|
||||
* @Author : 容器类型
|
||||
* @CreateDate : 2019-11-07 16:06
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_PACKAGE_SPEC")
|
||||
@Api("包装规格")
|
||||
public class WmsPackageSpec extends BaseBean {
|
||||
private static final long serialVersionUID = 4849044986767609445L;
|
||||
@Column(name = "SPEC_CODE",unique = true)
|
||||
@ApiParam(value = "包装规格代码")
|
||||
private String specCode;
|
||||
|
||||
@Column(name = "SPEC_NAME")
|
||||
@ApiParam(value = "包装规格名称")
|
||||
private String specName;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam(value = "包装数量")
|
||||
private Double qty;
|
||||
|
||||
@Column(name = "PARENT_SPEC")
|
||||
@ApiParam(value = "上级规格")
|
||||
private String parentSpec;
|
||||
|
||||
@Column(name = "SPEC_LEVEL")
|
||||
@ApiParam(value = "规格层级")
|
||||
private String specLevel;
|
||||
|
||||
@Column(name = "IS_MIXED")
|
||||
@ApiParam(value = "是否混包")
|
||||
private Integer isMixed;
|
||||
|
||||
|
||||
@Column(name = "POCKET_TYPE")
|
||||
@ApiParam(value = "默认容器类型")
|
||||
private String pocketType;
|
||||
|
||||
@ApiParam(value = "上级规格名称")
|
||||
@Transient
|
||||
private String parentName;
|
||||
}
|
@ -0,0 +1,68 @@
|
||||
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 :容器类型
|
||||
* @Reference :
|
||||
* @Author : 容器类型
|
||||
* @CreateDate : 2019-11-07 16:06
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "WMS_PART_PACKAGE")
|
||||
@Api("物料包装关系")
|
||||
public class WmsPartPackage extends BaseBean {
|
||||
private static final long serialVersionUID = 4849044986767609345L;
|
||||
@Column(name = "PART_NO",unique = true)
|
||||
@ApiParam(value = "物料编码")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "SPEC_CODE")
|
||||
@ApiParam(value = "包装规格代码")
|
||||
private String specCode;
|
||||
|
||||
@Column(name = "SNP_QTY")
|
||||
@ApiParam(value = "单包装数量")
|
||||
private String snpQty;
|
||||
|
||||
@Column(name = "BOX_QTY")
|
||||
@ApiParam(value = "包装箱数")
|
||||
private String boxQty;
|
||||
|
||||
@Column(name = "IS_DEFAULT")
|
||||
@ApiParam(value = "是否默认包规")
|
||||
private String isDefault;
|
||||
|
||||
@Column(name = "IS_MIXED")
|
||||
@ApiParam(value = "是否混包")
|
||||
private String isMixed;
|
||||
|
||||
@Column(name = "IS_PRINT")
|
||||
@ApiParam(value = "是否打印包装清单")
|
||||
private String isPrint;
|
||||
|
||||
@Column(name = "TEMPLATE_NO")
|
||||
@ApiParam(value = "包装清单模板")
|
||||
private String templateNo;
|
||||
|
||||
@Column(name = "POCKET_TYPE")
|
||||
@ApiParam(value = "容器类型")
|
||||
private String pocketType;
|
||||
}
|
@ -0,0 +1,27 @@
|
||||
package cn.estsh.i3plus.pojo.wms.dto;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsPartPackage;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description :物料包装关系入参
|
||||
* @Reference :
|
||||
* @Author : gcj
|
||||
* @CreateDate : 2019-11-07 16:06
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("物料包装关系入参")
|
||||
public class PartPackagDto{
|
||||
|
||||
@ApiParam(value = "物料编码")
|
||||
private String partNo;
|
||||
@ApiParam(value = "工厂代码")
|
||||
private List<WmsPartPackage> partPackages;
|
||||
|
||||
}
|
@ -0,0 +1,43 @@
|
||||
package cn.estsh.i3plus.pojo.wms.modelbean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Entity;
|
||||
|
||||
/**
|
||||
* @Description : 静态盘点输出model
|
||||
* @Reference :
|
||||
* @Author : qianhuasheng
|
||||
* @CreateDate : 2019-10-31 20:04
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Api("静态盘点查询输出model")
|
||||
public class WmsStaticCsModel extends BaseBean {
|
||||
public WmsStaticCsModel(String staticStr,String orderNo, String locateNo, String sn, double qty ) {
|
||||
this.orderNo = orderNo;
|
||||
this.locateNo = locateNo;
|
||||
this.sn = sn;
|
||||
this.qty = qty;
|
||||
this.staticStr = staticStr;
|
||||
}
|
||||
|
||||
@ApiParam(value = "订单号")
|
||||
private String orderNo;
|
||||
@ApiParam(value = "库存号")
|
||||
private String locateNo;
|
||||
@ApiParam(value = "条码")
|
||||
private String sn;
|
||||
@ApiParam(value = "数量")
|
||||
private double qty;
|
||||
@ApiParam(value = "状态")
|
||||
private String staticStr;
|
||||
|
||||
public WmsStaticCsModel() {
|
||||
|
||||
}
|
||||
}
|
@ -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.WmsContainerType;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :容器类型Repository的方法接口
|
||||
* @Reference :
|
||||
* @Author : gcj
|
||||
* @CreateDate : 2019-11-08 10:19
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsContainerTypeRepository extends BaseRepository<WmsContainerType, 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.WmsContainerType;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsPackageSpec;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :包装规格Repository的方法接口
|
||||
* @Reference :
|
||||
* @Author : gcj
|
||||
* @CreateDate : 2019-11-08 10:19
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsPackageSpecRepository extends BaseRepository<WmsPackageSpec, 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.WmsPackageSpec;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsPartPackage;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :包装关系Repository的方法接口
|
||||
* @Reference :
|
||||
* @Author : gcj
|
||||
* @CreateDate : 2019-11-08 10:19
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsPartPackageRepository extends BaseRepository<WmsPartPackage, Long> {
|
||||
}
|
Loading…
Reference in New Issue