diff --git a/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java b/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java new file mode 100644 index 000000000..4e7e12b77 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.collect; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.collect.RelCodeBatch; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RelCodeBatchMapper extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java b/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java new file mode 100644 index 000000000..0fa24042e --- /dev/null +++ b/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.collect; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.collect.RelCodeDetail; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RelCodeDetailMapper extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java b/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java new file mode 100644 index 000000000..3eb547fa4 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/collect/RelCodeBatch.java @@ -0,0 +1,98 @@ +package com.glxp.api.entity.collect; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +@ApiModel(value="com-glxp-api-entity-collect-RelCodeBatch") +@Data +@TableName(value = "rel_code_batch") +public class RelCodeBatch implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value="") + private Integer id; + + /** + * 产品编码 + */ + @TableField(value = "productCode") + @ApiModelProperty(value="产品编码") + private String productCode; + + /** + * 类型编码 + */ + @TableField(value = "subTypeNo") + @ApiModelProperty(value="类型编码") + private String subTypeNo; + + /** + * 包装比例 + */ + @TableField(value = "cascade") + @ApiModelProperty(value="包装比例") + private String cascade; + + /** + * 包装规格 + */ + @TableField(value = "packageSpec") + @ApiModelProperty(value="包装规格") + private String packageSpec; + + /** + * 备注 + */ + @TableField(value = "comment") + @ApiModelProperty(value="备注") + private String comment; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + @ApiModelProperty(value="批次号") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "madeDate") + @ApiModelProperty(value="生产日期") + private Date madeDate; + + /** + * 有效期至 + */ + @TableField(value = "validateDate") + @ApiModelProperty(value="有效期至") + private Date validateDate; + + /** + * 生产车间 + */ + @TableField(value = "workShop") + @ApiModelProperty(value="生产车间") + private String workShop; + + /** + * 生产线 + */ + @TableField(value = "lineName") + @ApiModelProperty(value="生产线") + private String lineName; + + /** + * 负责人 + */ + @TableField(value = "lineManager") + @ApiModelProperty(value="负责人") + private String lineManager; + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/collect/RelCodeDetail.java b/src/main/java/com/glxp/api/entity/collect/RelCodeDetail.java new file mode 100644 index 000000000..939cac0f3 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/collect/RelCodeDetail.java @@ -0,0 +1,55 @@ +package com.glxp.api.entity.collect; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import lombok.Data; + +@ApiModel(value="com-glxp-api-entity-collect-RelCodeDetail") +@Data +@TableName(value = "rel_code_detail") +public class RelCodeDetail implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value="") + private Integer id; + + /** + * 当前条码 + */ + @TableField(value = "curCode") + @ApiModelProperty(value="当前条码") + private String curCode; + + /** + * 包装级别 + */ + @TableField(value = "packLayer") + @ApiModelProperty(value="包装级别") + private Byte packLayer; + + /** + * 父级码 + */ + @TableField(value = "parentCode") + @ApiModelProperty(value="父级码") + private String parentCode; + + /** + * 状态 + */ + @TableField(value = "flag") + @ApiModelProperty(value="状态") + private Byte flag; + + /** + * 产品批次ID外键 + */ + @TableField(value = "batchIdFk") + @ApiModelProperty(value="产品批次ID外键") + private Integer batchIdFk; + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java new file mode 100644 index 000000000..41455ebd9 --- /dev/null +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -0,0 +1,12 @@ +package com.glxp.api.service.collect; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.collect.RelCodeBatchMapper; +import com.glxp.api.entity.collect.RelCodeBatch; +@Service +public class RelCodeBatchService extends ServiceImpl { + +} diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java b/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java new file mode 100644 index 000000000..2ee1758ae --- /dev/null +++ b/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java @@ -0,0 +1,12 @@ +package com.glxp.api.service.collect; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.collect.RelCodeDetailMapper; +import com.glxp.api.entity.collect.RelCodeDetail; +@Service +public class RelCodeDetailService extends ServiceImpl { + +} diff --git a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml new file mode 100644 index 000000000..5114e8117 --- /dev/null +++ b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + id, productCode, subTypeNo, `cascade`, packageSpec, `comment`, batchNo, madeDate, + validateDate, workShop, lineName, lineManager + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/collect/RelCodeDetailMapper.xml b/src/main/resources/mybatis/mapper/collect/RelCodeDetailMapper.xml new file mode 100644 index 000000000..ebe95c308 --- /dev/null +++ b/src/main/resources/mybatis/mapper/collect/RelCodeDetailMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + id, curCode, packLayer, parentCode, flag, batchIdFk + + \ No newline at end of file