diff --git a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcBrand.java b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcBrand.java index 028a2d0..9fe8a42 100644 --- a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcBrand.java +++ b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcBrand.java @@ -1,5 +1,7 @@ package com.ruoyi.dhc.domain; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -11,18 +13,22 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author ruoyi * @date 2024-07-29 */ +@ApiModel(value = "DhcBrand", description = "品牌") public class DhcBrand extends BaseEntity { private static final long serialVersionUID = 1L; /** 品牌id */ + @ApiModelProperty("品牌id") private Long brandId; /** 品牌编码 */ + @ApiModelProperty("品牌编码") @Excel(name = "品牌编码") private String brandCode; /** 品牌名称 */ + @ApiModelProperty("品牌名称") @Excel(name = "品牌名称") private String brandName; diff --git a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcProduct.java b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcProduct.java index 5cbfa4a..aae2cfb 100644 --- a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcProduct.java +++ b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcProduct.java @@ -1,5 +1,4 @@ package com.ruoyi.dhc.domain; - import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -7,13 +6,16 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; /** * 产品信息对象 dhc_product - * + * * @author ruoyi - * @date 2024-10-08 + * @date 2025-03-14 */ +@ApiModel(value = "DhcProduct", description = "产品信息") public class DhcProduct extends BaseEntity { private static final long serialVersionUID = 1L; @@ -22,389 +24,417 @@ public class DhcProduct extends BaseEntity private Long productId; /** 产品线编码 */ + @ApiModelProperty("产品线编码") @Excel(name = "产品线编码") private String productLine; /** 产品线名称 */ + @ApiModelProperty("产品线名称") @Excel(name = "产品线名称") private String productLineName; /** 立项单号 */ + @ApiModelProperty("立项单号") @Excel(name = "立项单号") private String projectNum; /** 内部型号 */ + @ApiModelProperty("内部型号") @Excel(name = "内部型号") private String internalModel; /** 产品大类编码 */ + @ApiModelProperty("产品大类编码") @Excel(name = "产品大类编码") private String productCategoryLarge; /** 产品中类编码 */ + @ApiModelProperty("产品中类编码") @Excel(name = "产品中类编码") private String productCategoryMiddle; /** 产品小类编码 */ + @ApiModelProperty("产品小类编码") @Excel(name = "产品小类编码") private String productCategorySmall; /** 产品品类 */ + @ApiModelProperty("产品品类") @Excel(name = "产品品类") private String productCategory; /** 产品系列 */ + @ApiModelProperty("产品系列") @Excel(name = "产品系列") private String productSeries; /** 基础型号 */ + @ApiModelProperty("基础型号") @Excel(name = "基础型号") private String baseModel; /** 本厂型号 */ + @ApiModelProperty("本厂型号") @Excel(name = "本厂型号") private String factoryModel; /** 客户型号 */ + @ApiModelProperty("客户型号") @Excel(name = "客户型号") private String customerModel; /** 品牌id */ + @ApiModelProperty("品牌id") @Excel(name = "品牌id") private Long brandId; /** 品牌名称 */ + @ApiModelProperty("品牌名称") @Excel(name = "品牌名称") private String brandName; /** IR时间 */ + @ApiModelProperty("IR时间") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "IR时间", width = 30, dateFormat = "yyyy-MM-dd") private Date irDatetime; /** DR时间 */ + @ApiModelProperty("DR时间") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "DR时间", width = 30, dateFormat = "yyyy-MM-dd") private Date drDatetime; /** 包装方式 */ + @ApiModelProperty("包装方式") @Excel(name = "包装方式") private String packWayCode; /** 净重 */ + @ApiModelProperty("净重") @Excel(name = "净重") private BigDecimal productNetWeight; /** 产品尺寸-长 */ + @ApiModelProperty("产品尺寸-长") @Excel(name = "产品尺寸-长") private BigDecimal productLength; /** 产品尺寸-宽 */ + @ApiModelProperty("产品尺寸-宽") @Excel(name = "产品尺寸-宽") private BigDecimal productWidth; /** 产品尺寸-高 */ + @ApiModelProperty("产品尺寸-高") @Excel(name = "产品尺寸-高") private BigDecimal productHeight; /** 装柜数量-20GP */ + @ApiModelProperty("装柜数量-20GP") @Excel(name = "装柜数量-20GP") private Long loadingQuantity20gp; /** 装柜数量-40GP */ + @ApiModelProperty("装柜数量-40GP") @Excel(name = "装柜数量-40GP") private Long loadingQuantity40gp; /** 装柜数量-40HQ */ + @ApiModelProperty("装柜数量-40HQ") @Excel(name = "装柜数量-40HQ") private Long loadingQuantity40hq; /** 最小订单量 */ + @ApiModelProperty("最小订单量") @Excel(name = "最小订单量") private Long minOrderQuantity; /** 其他要求 */ + @ApiModelProperty("其他要求") @Excel(name = "其他要求") private String otherRequirement; /** 型号状态（0草稿 1在售 2下市 3冻结） */ + @ApiModelProperty("型号状态（0草稿 1在售 2下市 3冻结）") @Excel(name = "型号状态", readConverterExp = "0=草稿,1=在售,2=下市,3=冻结") private String STATUS; /** 审核状态（0审批中 1已通过 2已驳回） */ + @ApiModelProperty("审核状态（0审批中 1已通过 2已驳回）") @Excel(name = "审核状态", readConverterExp = "0=审批中,1=已通过,2=已驳回") private String approveStatus; /** 删除标志（0代表存在 1代表删除） */ private String delFlag; - public void setProductId(Long productId) + public void setProductId(Long productId) { this.productId = productId; } - public Long getProductId() + public Long getProductId() { return productId; } - public void setProductLine(String productLine) + public void setProductLine(String productLine) { this.productLine = productLine; } - public String getProductLine() + public String getProductLine() { return productLine; } - public void setProductLineName(String productLineName) + public void setProductLineName(String productLineName) { this.productLineName = productLineName; } - public String getProductLineName() + public String getProductLineName() { return productLineName; } - public void setProjectNum(String projectNum) + public void setProjectNum(String projectNum) { this.projectNum = projectNum; } - public String getProjectNum() + public String getProjectNum() { return projectNum; } - public void setInternalModel(String internalModel) + public void setInternalModel(String internalModel) { this.internalModel = internalModel; } - public String getInternalModel() + public String getInternalModel() { return internalModel; } - public void setProductCategoryLarge(String productCategoryLarge) + public void setProductCategoryLarge(String productCategoryLarge) { this.productCategoryLarge = productCategoryLarge; } - public String getProductCategoryLarge() + public String getProductCategoryLarge() { return productCategoryLarge; } - public void setProductCategoryMiddle(String productCategoryMiddle) + public void setProductCategoryMiddle(String productCategoryMiddle) { this.productCategoryMiddle = productCategoryMiddle; } - public String getProductCategoryMiddle() + public String getProductCategoryMiddle() { return productCategoryMiddle; } - public void setProductCategorySmall(String productCategorySmall) + public void setProductCategorySmall(String productCategorySmall) { this.productCategorySmall = productCategorySmall; } - public String getProductCategorySmall() + public String getProductCategorySmall() { return productCategorySmall; } - public void setProductCategory(String productCategory) + public void setProductCategory(String productCategory) { this.productCategory = productCategory; } - public String getProductCategory() + public String getProductCategory() { return productCategory; } - public void setProductSeries(String productSeries) + public void setProductSeries(String productSeries) { this.productSeries = productSeries; } - public String getProductSeries() + public String getProductSeries() { return productSeries; } - public void setBaseModel(String baseModel) + public void setBaseModel(String baseModel) { this.baseModel = baseModel; } - public String getBaseModel() + public String getBaseModel() { return baseModel; } - public void setFactoryModel(String factoryModel) + public void setFactoryModel(String factoryModel) { this.factoryModel = factoryModel; } - public String getFactoryModel() + public String getFactoryModel() { return factoryModel; } - public void setCustomerModel(String customerModel) + public void setCustomerModel(String customerModel) { this.customerModel = customerModel; } - public String getCustomerModel() + public String getCustomerModel() { return customerModel; } - public void setBrandId(Long brandId) + public void setBrandId(Long brandId) { this.brandId = brandId; } - public Long getBrandId() + public Long getBrandId() { return brandId; } - public void setBrandName(String brandName) + public void setBrandName(String brandName) { this.brandName = brandName; } - public String getBrandName() + public String getBrandName() { return brandName; } - public void setIrDatetime(Date irDatetime) + public void setIrDatetime(Date irDatetime) { this.irDatetime = irDatetime; } - public Date getIrDatetime() + public Date getIrDatetime() { return irDatetime; } - public void setDrDatetime(Date drDatetime) + public void setDrDatetime(Date drDatetime) { this.drDatetime = drDatetime; } - public Date getDrDatetime() + public Date getDrDatetime() { return drDatetime; } - public void setPackWayCode(String packWayCode) + public void setPackWayCode(String packWayCode) { this.packWayCode = packWayCode; } - public String getPackWayCode() + public String getPackWayCode() { return packWayCode; } - public void setProductNetWeight(BigDecimal productNetWeight) + public void setProductNetWeight(BigDecimal productNetWeight) { this.productNetWeight = productNetWeight; } - public BigDecimal getProductNetWeight() + public BigDecimal getProductNetWeight() { return productNetWeight; } - public void setProductLength(BigDecimal productLength) + public void setProductLength(BigDecimal productLength) { this.productLength = productLength; } - public BigDecimal getProductLength() + public BigDecimal getProductLength() { return productLength; } - public void setProductWidth(BigDecimal productWidth) + public void setProductWidth(BigDecimal productWidth) { this.productWidth = productWidth; } - public BigDecimal getProductWidth() + public BigDecimal getProductWidth() { return productWidth; } - public void setProductHeight(BigDecimal productHeight) + public void setProductHeight(BigDecimal productHeight) { this.productHeight = productHeight; } - public BigDecimal getProductHeight() + public BigDecimal getProductHeight() { return productHeight; } - public void setLoadingQuantity20gp(Long loadingQuantity20gp) + public void setLoadingQuantity20gp(Long loadingQuantity20gp) { this.loadingQuantity20gp = loadingQuantity20gp; } - public Long getLoadingQuantity20gp() + public Long getLoadingQuantity20gp() { return loadingQuantity20gp; } - public void setLoadingQuantity40gp(Long loadingQuantity40gp) + public void setLoadingQuantity40gp(Long loadingQuantity40gp) { this.loadingQuantity40gp = loadingQuantity40gp; } - public Long getLoadingQuantity40gp() + public Long getLoadingQuantity40gp() { return loadingQuantity40gp; } - public void setLoadingQuantity40hq(Long loadingQuantity40hq) + public void setLoadingQuantity40hq(Long loadingQuantity40hq) { this.loadingQuantity40hq = loadingQuantity40hq; } - public Long getLoadingQuantity40hq() + public Long getLoadingQuantity40hq() { return loadingQuantity40hq; } - public void setMinOrderQuantity(Long minOrderQuantity) + public void setMinOrderQuantity(Long minOrderQuantity) { this.minOrderQuantity = minOrderQuantity; } - public Long getMinOrderQuantity() + public Long getMinOrderQuantity() { return minOrderQuantity; } - public void setOtherRequirement(String otherRequirement) + public void setOtherRequirement(String otherRequirement) { this.otherRequirement = otherRequirement; } - public String getOtherRequirement() + public String getOtherRequirement() { return otherRequirement; } - public void setSTATUS(String STATUS) + public void setSTATUS(String STATUS) { this.STATUS = STATUS; } - public String getSTATUS() + public String getSTATUS() { return STATUS; } - public void setApproveStatus(String approveStatus) + public void setApproveStatus(String approveStatus) { this.approveStatus = approveStatus; } - public String getApproveStatus() + public String getApproveStatus() { return approveStatus; } - public void setDelFlag(String delFlag) + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getDelFlag() + public String getDelFlag() { return delFlag; } @@ -412,40 +442,40 @@ public class DhcProduct extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("productId", getProductId()) - .append("productLine", getProductLine()) - .append("productLineName", getProductLineName()) - .append("projectNum", getProjectNum()) - .append("internalModel", getInternalModel()) - .append("productCategoryLarge", getProductCategoryLarge()) - .append("productCategoryMiddle", getProductCategoryMiddle()) - .append("productCategorySmall", getProductCategorySmall()) - .append("productCategory", getProductCategory()) - .append("productSeries", getProductSeries()) - .append("baseModel", getBaseModel()) - .append("factoryModel", getFactoryModel()) - .append("customerModel", getCustomerModel()) - .append("brandId", getBrandId()) - .append("brandName", getBrandName()) - .append("irDatetime", getIrDatetime()) - .append("drDatetime", getDrDatetime()) - .append("packWayCode", getPackWayCode()) - .append("productNetWeight", getProductNetWeight()) - .append("productLength", getProductLength()) - .append("productWidth", getProductWidth()) - .append("productHeight", getProductHeight()) - .append("loadingQuantity20gp", getLoadingQuantity20gp()) - .append("loadingQuantity40gp", getLoadingQuantity40gp()) - .append("loadingQuantity40hq", getLoadingQuantity40hq()) - .append("minOrderQuantity", getMinOrderQuantity()) - .append("otherRequirement", getOtherRequirement()) - .append("STATUS", getSTATUS()) - .append("approveStatus", getApproveStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} + .append("productId", getProductId()) + .append("productLine", getProductLine()) + .append("productLineName", getProductLineName()) + .append("projectNum", getProjectNum()) + .append("internalModel", getInternalModel()) + .append("productCategoryLarge", getProductCategoryLarge()) + .append("productCategoryMiddle", getProductCategoryMiddle()) + .append("productCategorySmall", getProductCategorySmall()) + .append("productCategory", getProductCategory()) + .append("productSeries", getProductSeries()) + .append("baseModel", getBaseModel()) + .append("factoryModel", getFactoryModel()) + .append("customerModel", getCustomerModel()) + .append("brandId", getBrandId()) + .append("brandName", getBrandName()) + .append("irDatetime", getIrDatetime()) + .append("drDatetime", getDrDatetime()) + .append("packWayCode", getPackWayCode()) + .append("productNetWeight", getProductNetWeight()) + .append("productLength", getProductLength()) + .append("productWidth", getProductWidth()) + .append("productHeight", getProductHeight()) + .append("loadingQuantity20gp", getLoadingQuantity20gp()) + .append("loadingQuantity40gp", getLoadingQuantity40gp()) + .append("loadingQuantity40hq", getLoadingQuantity40hq()) + .append("minOrderQuantity", getMinOrderQuantity()) + .append("otherRequirement", getOtherRequirement()) + .append("STATUS", getSTATUS()) + .append("approveStatus", getApproveStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} \ No newline at end of file diff --git a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanDetail.java b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanDetail.java index 7d9a9d2..1649725 100644 --- a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanDetail.java +++ b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanDetail.java @@ -6,13 +6,16 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; /** * 滚动计划明细对象 dhc_roll_plan_detail - * + * * @author ruoyi * @date 2024-09-23 */ +@ApiModel(value = "DhcRollPlanDetail", description = "滚动计划明细") public class DhcRollPlanDetail extends BaseEntity { private static final long serialVersionUID = 1L; @@ -21,794 +24,853 @@ public class DhcRollPlanDetail extends BaseEntity private Long rollPlanDetailId; /** 滚动计划id */ + @ApiModelProperty("滚动计划id") @Excel(name = "滚动计划id") private Long rollPlanId; /** 滚动计划号 */ + @ApiModelProperty("滚动计划号") @Excel(name = "滚动计划号") private String rollPlanNum; /** 滚动计划序号 */ + @ApiModelProperty("滚动计划序号") @Excel(name = "滚动计划序号") private String rollPlanNo; /** 整机编码 */ + @ApiModelProperty("整机编码") @Excel(name = "整机编码") private String completeMachineCode; /** 计划版本（排产计划导入的） */ + @ApiModelProperty("计划版本（排产计划导入的）") @Excel(name = "计划版本", readConverterExp = "排=产计划导入的") private String planVersion; /** 计划内/计划外（Y/N） */ + @ApiModelProperty("计划内/计划外（Y/N）") @Excel(name = "计划内/计划外", readConverterExp = "Y=/N") private String planInout; /** 国家编码 */ + @ApiModelProperty("国家编码") @Excel(name = "国家编码") private String countryCode; /** 国家名称 */ + @ApiModelProperty("国家名称") @Excel(name = "国家名称") private String countryName; /** 客户编码 */ + @ApiModelProperty("客户编码") @Excel(name = "客户编码") private String dealerCode; /** 客户名称 */ + @ApiModelProperty("客户名称") @Excel(name = "客户名称") private String dealerName; /** 销售大区编码 */ + @ApiModelProperty("销售大区编码") @Excel(name = "销售大区编码") private String areaCodeLarge; /** 销售大区名称 */ + @ApiModelProperty("销售大区名称") @Excel(name = "销售大区名称") private String areaNameLarge; /** 销售小区编码 */ + @ApiModelProperty("销售小区编码") @Excel(name = "销售小区编码") private String areaCodeSmall; /** 销售小区名称 */ + @ApiModelProperty("销售小区名称") @Excel(name = "销售小区名称") private String areaNameSmall; /** 业务线负责人编号 */ + @ApiModelProperty("业务线负责人编号") @Excel(name = "业务线负责人编号") private String deptEmpCode; /** 业务线负责人名称 */ + @ApiModelProperty("业务线负责人名称") @Excel(name = "业务线负责人名称") private String deptEmpName; /** 内部型号 */ + @ApiModelProperty("内部型号") @Excel(name = "内部型号") private String internalModel; /** 客户型号 */ + @ApiModelProperty("客户型号") @Excel(name = "客户型号") private String customerModel; /** 计划数量 */ + @ApiModelProperty("计划数量") @Excel(name = "计划数量") private Long planQuantity; /** 计划数量（N-1周） */ + @ApiModelProperty("计划数量（N-1周）") @Excel(name = "计划数量", readConverterExp = "N=-1周") private Long planQuantityPre; /** 正式版计划数量 */ + @ApiModelProperty("正式版计划数量") @Excel(name = "正式版计划数量") private Long formalPlanQuantity; /** 产品大类编码 */ + @ApiModelProperty("产品大类编码") @Excel(name = "产品大类编码") private String productCategoryLarge; /** 产品中类编码 */ + @ApiModelProperty("产品中类编码") @Excel(name = "产品中类编码") private String productCategoryMiddle; /** 产品小类编码 */ + @ApiModelProperty("产品小类编码") @Excel(name = "产品小类编码") private String productCategorySmall; /** 产品品类 */ + @ApiModelProperty("产品品类") @Excel(name = "产品品类") private String productCategory; /** 尺寸 */ + @ApiModelProperty("尺寸") @Excel(name = "尺寸") private String productSize; /** 生成基地编码 */ + @ApiModelProperty("生成基地编码") @Excel(name = "生成基地编码") private String productionBaseCode; /** 生成基地名称 */ + @ApiModelProperty("生成基地名称") @Excel(name = "生成基地名称") private String productionBaseName; /** 包装方式编码 */ + @ApiModelProperty("包装方式编码") @Excel(name = "包装方式编码") private String packWayCode; /** 包装方式名称 */ + @ApiModelProperty("包装方式名称") @Excel(name = "包装方式名称") private String packWayName; /** 合同号 */ + @ApiModelProperty("合同号") @Excel(name = "合同号") private String contractNum; /** 品牌编码 */ + @ApiModelProperty("品牌编码") @Excel(name = "品牌编码") private String brandCode; /** 品牌名称 */ + @ApiModelProperty("品牌名称") @Excel(name = "品牌名称") private String brandName; /** 生产日期 */ + @ApiModelProperty("生产日期") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") private Date productionDate; /** 生产年 */ + @ApiModelProperty("生产年") @Excel(name = "生产年") private Long productionYear; /** 生产周 */ + @ApiModelProperty("生产周") @Excel(name = "生产周") private Long productionWeek; /** 交货日期 */ + @ApiModelProperty("交货日期") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "交货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date deliveryDate; /** 交货日期（N-1周） */ + @ApiModelProperty("交货日期（N-1周）") @Excel(name = "交货日期", readConverterExp = "N=-1周") private Date deliveryDatePre; /** 交货年 */ + @ApiModelProperty("交货年") @Excel(name = "交货年") private Long deliveryYear; /** 交货周 */ + @ApiModelProperty("交货周") @Excel(name = "交货周") private Long deliveryWeek; /** 正式版交货日期 */ + @ApiModelProperty("正式版交货日期") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "正式版交货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date formalDeliveryDate; /** 排定日期 */ + @ApiModelProperty("排定日期") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "排定日期", width = 30, dateFormat = "yyyy-MM-dd") private Date ordPlanDate; /** 销售协调编码 */ + @ApiModelProperty("销售协调编码") @Excel(name = "销售协调编码") private String salesAssistantCode; /** 销售协调名称 */ + @ApiModelProperty("销售协调名称") @Excel(name = "销售协调名称") private String salesAssistantName; /** 项目经理编码 */ + @ApiModelProperty("项目经理编码") @Excel(name = "项目经理编码") private String pmCode; /** 项目经理名称 */ + @ApiModelProperty("项目经理名称") @Excel(name = "项目经理名称") private String pmName; /** 是否首单（0.否 1.是） */ + @ApiModelProperty("是否首单（0.否 1.是）") @Excel(name = "是否首单", readConverterExp = "0=.否,1=.是") private String isFirstOrder; /** 是否零号计划（0.否 1.是） */ + @ApiModelProperty("是否零号计划（0.否 1.是）") @Excel(name = "是否零号计划", readConverterExp = "0=.否,1=.是") private String isPlanZero; /** 是否直发（0.否 1.是） */ + @ApiModelProperty("是否直发（0.否 1.是）") @Excel(name = "是否直发", readConverterExp = "0=.否,1=.是") private String isStraight; /** 生产方式（0.自制 1.ODM） */ + @ApiModelProperty("生产方式（0.自制 1.ODM）") @Excel(name = "生产方式", readConverterExp = "0=.自制,1=.ODM") private String productionMothod; /** 供应商编码 */ + @ApiModelProperty("供应商编码") @Excel(name = "供应商编码") private String supplierCode; /** 供应商名称 */ + @ApiModelProperty("供应商名称") @Excel(name = "供应商名称") private String supplierName; /** 订单阶段 */ + @ApiModelProperty("订单阶段") @Excel(name = "订单阶段") private String orderStage; /** 订单类别（A,B，C） */ + @ApiModelProperty("订单类别（A,B，C）") @Excel(name = "订单类别", readConverterExp = "A=,B，C") private String orderType; /** 异常信息 */ + @ApiModelProperty("异常信息") @Excel(name = "异常信息") private String abnormalInfo; /** 异常信息说明 */ + @ApiModelProperty("异常信息说明") @Excel(name = "异常信息说明") private String abnormalSpec; /** 当地自制物料 */ + @ApiModelProperty("当地自制物料") @Excel(name = "当地自制物料") private String shelfMaterial; /** 市场反馈 */ + @ApiModelProperty("市场反馈") @Excel(name = "市场反馈") private String feedbackMarket; /** 计划明细状态（0初始化 1已提交 2已审核 3评审版已发布 4.正式版已发布 5.待市场反馈 6.已应答不满足） */ + @ApiModelProperty("计划明细状态（0初始化 1已提交 2已审核 3评审版已发布 4.正式版已发布 5.待市场反馈 6.已应答不满足）") @Excel(name = "计划明细状态", readConverterExp = "0=初始化,1=已提交,2=已审核,3=评审版已发布,4=.正式版已发布,5=.待市场反馈,6=.已应答不满足") private String detailStatus; /** 删除标志（0代表存在 1代表删除） */ private String delFlag; - public void setRollPlanDetailId(Long rollPlanDetailId) + public void setRollPlanDetailId(Long rollPlanDetailId) { this.rollPlanDetailId = rollPlanDetailId; } - public Long getRollPlanDetailId() + public Long getRollPlanDetailId() { return rollPlanDetailId; } - public void setRollPlanId(Long rollPlanId) + public void setRollPlanId(Long rollPlanId) { this.rollPlanId = rollPlanId; } - public Long getRollPlanId() + public Long getRollPlanId() { return rollPlanId; } - public void setRollPlanNum(String rollPlanNum) + public void setRollPlanNum(String rollPlanNum) { this.rollPlanNum = rollPlanNum; } - public String getRollPlanNum() + public String getRollPlanNum() { return rollPlanNum; } - public void setRollPlanNo(String rollPlanNo) + public void setRollPlanNo(String rollPlanNo) { this.rollPlanNo = rollPlanNo; } - public String getRollPlanNo() + public String getRollPlanNo() { return rollPlanNo; } - public void setCompleteMachineCode(String completeMachineCode) + public void setCompleteMachineCode(String completeMachineCode) { this.completeMachineCode = completeMachineCode; } - public String getCompleteMachineCode() + public String getCompleteMachineCode() { return completeMachineCode; } - public void setPlanVersion(String planVersion) + public void setPlanVersion(String planVersion) { this.planVersion = planVersion; } - public String getPlanVersion() + public String getPlanVersion() { return planVersion; } - public void setPlanInout(String planInout) + public void setPlanInout(String planInout) { this.planInout = planInout; } - public String getPlanInout() + public String getPlanInout() { return planInout; } - public void setCountryCode(String countryCode) + public void setCountryCode(String countryCode) { this.countryCode = countryCode; } - public String getCountryCode() + public String getCountryCode() { return countryCode; } - public void setCountryName(String countryName) + public void setCountryName(String countryName) { this.countryName = countryName; } - public String getCountryName() + public String getCountryName() { return countryName; } - public void setDealerCode(String dealerCode) + public void setDealerCode(String dealerCode) { this.dealerCode = dealerCode; } - public String getDealerCode() + public String getDealerCode() { return dealerCode; } - public void setDealerName(String dealerName) + public void setDealerName(String dealerName) { this.dealerName = dealerName; } - public String getDealerName() + public String getDealerName() { return dealerName; } - public void setAreaCodeLarge(String areaCodeLarge) + public void setAreaCodeLarge(String areaCodeLarge) { this.areaCodeLarge = areaCodeLarge; } - public String getAreaCodeLarge() + public String getAreaCodeLarge() { return areaCodeLarge; } - public void setAreaNameLarge(String areaNameLarge) + public void setAreaNameLarge(String areaNameLarge) { this.areaNameLarge = areaNameLarge; } - public String getAreaNameLarge() + public String getAreaNameLarge() { return areaNameLarge; } - public void setAreaCodeSmall(String areaCodeSmall) + public void setAreaCodeSmall(String areaCodeSmall) { this.areaCodeSmall = areaCodeSmall; } - public String getAreaCodeSmall() + public String getAreaCodeSmall() { return areaCodeSmall; } - public void setAreaNameSmall(String areaNameSmall) + public void setAreaNameSmall(String areaNameSmall) { this.areaNameSmall = areaNameSmall; } - public String getAreaNameSmall() + public String getAreaNameSmall() { return areaNameSmall; } - public void setDeptEmpCode(String deptEmpCode) + public void setDeptEmpCode(String deptEmpCode) { this.deptEmpCode = deptEmpCode; } - public String getDeptEmpCode() + public String getDeptEmpCode() { return deptEmpCode; } - public void setDeptEmpName(String deptEmpName) + public void setDeptEmpName(String deptEmpName) { this.deptEmpName = deptEmpName; } - public String getDeptEmpName() + public String getDeptEmpName() { return deptEmpName; } - public void setInternalModel(String internalModel) + public void setInternalModel(String internalModel) { this.internalModel = internalModel; } - public String getInternalModel() + public String getInternalModel() { return internalModel; } - public void setCustomerModel(String customerModel) + public void setCustomerModel(String customerModel) { this.customerModel = customerModel; } - public String getCustomerModel() + public String getCustomerModel() { return customerModel; } - public void setPlanQuantity(Long planQuantity) + public void setPlanQuantity(Long planQuantity) { this.planQuantity = planQuantity; } - public Long getPlanQuantity() + public Long getPlanQuantity() { return planQuantity; } - public void setPlanQuantityPre(Long planQuantityPre) + public void setPlanQuantityPre(Long planQuantityPre) { this.planQuantityPre = planQuantityPre; } - public Long getPlanQuantityPre() + public Long getPlanQuantityPre() { return planQuantityPre; } - public void setFormalPlanQuantity(Long formalPlanQuantity) + public void setFormalPlanQuantity(Long formalPlanQuantity) { this.formalPlanQuantity = formalPlanQuantity; } - public Long getFormalPlanQuantity() + public Long getFormalPlanQuantity() { return formalPlanQuantity; } - public void setProductCategoryLarge(String productCategoryLarge) + public void setProductCategoryLarge(String productCategoryLarge) { this.productCategoryLarge = productCategoryLarge; } - public String getProductCategoryLarge() + public String getProductCategoryLarge() { return productCategoryLarge; } - public void setProductCategoryMiddle(String productCategoryMiddle) + public void setProductCategoryMiddle(String productCategoryMiddle) { this.productCategoryMiddle = productCategoryMiddle; } - public String getProductCategoryMiddle() + public String getProductCategoryMiddle() { return productCategoryMiddle; } - public void setProductCategorySmall(String productCategorySmall) + public void setProductCategorySmall(String productCategorySmall) { this.productCategorySmall = productCategorySmall; } - public String getProductCategorySmall() + public String getProductCategorySmall() { return productCategorySmall; } - public void setProductCategory(String productCategory) + public void setProductCategory(String productCategory) { this.productCategory = productCategory; } - public String getProductCategory() + public String getProductCategory() { return productCategory; } - public void setProductSize(String productSize) + public void setProductSize(String productSize) { this.productSize = productSize; } - public String getProductSize() + public String getProductSize() { return productSize; } - public void setProductionBaseCode(String productionBaseCode) + public void setProductionBaseCode(String productionBaseCode) { this.productionBaseCode = productionBaseCode; } - public String getProductionBaseCode() + public String getProductionBaseCode() { return productionBaseCode; } - public void setProductionBaseName(String productionBaseName) + public void setProductionBaseName(String productionBaseName) { this.productionBaseName = productionBaseName; } - public String getProductionBaseName() + public String getProductionBaseName() { return productionBaseName; } - public void setPackWayCode(String packWayCode) + public void setPackWayCode(String packWayCode) { this.packWayCode = packWayCode; } - public String getPackWayCode() + public String getPackWayCode() { return packWayCode; } - public void setPackWayName(String packWayName) + public void setPackWayName(String packWayName) { this.packWayName = packWayName; } - public String getPackWayName() + public String getPackWayName() { return packWayName; } - public void setContractNum(String contractNum) + public void setContractNum(String contractNum) { this.contractNum = contractNum; } - public String getContractNum() + public String getContractNum() { return contractNum; } - public void setBrandCode(String brandCode) + public void setBrandCode(String brandCode) { this.brandCode = brandCode; } - public String getBrandCode() + public String getBrandCode() { return brandCode; } - public void setBrandName(String brandName) + public void setBrandName(String brandName) { this.brandName = brandName; } - public String getBrandName() + public String getBrandName() { return brandName; } - public void setProductionDate(Date productionDate) + public void setProductionDate(Date productionDate) { this.productionDate = productionDate; } - public Date getProductionDate() + public Date getProductionDate() { return productionDate; } - public void setProductionYear(Long productionYear) + public void setProductionYear(Long productionYear) { this.productionYear = productionYear; } - public Long getProductionYear() + public Long getProductionYear() { return productionYear; } - public void setProductionWeek(Long productionWeek) + public void setProductionWeek(Long productionWeek) { this.productionWeek = productionWeek; } - public Long getProductionWeek() + public Long getProductionWeek() { return productionWeek; } - public void setDeliveryDate(Date deliveryDate) + public void setDeliveryDate(Date deliveryDate) { this.deliveryDate = deliveryDate; } - public Date getDeliveryDate() + public Date getDeliveryDate() { return deliveryDate; } - public void setDeliveryDatePre(Date deliveryDatePre) + public void setDeliveryDatePre(Date deliveryDatePre) { this.deliveryDatePre = deliveryDatePre; } - public Date getDeliveryDatePre() + public Date getDeliveryDatePre() { return deliveryDatePre; } - public void setDeliveryYear(Long deliveryYear) + public void setDeliveryYear(Long deliveryYear) { this.deliveryYear = deliveryYear; } - public Long getDeliveryYear() + public Long getDeliveryYear() { return deliveryYear; } - public void setDeliveryWeek(Long deliveryWeek) + public void setDeliveryWeek(Long deliveryWeek) { this.deliveryWeek = deliveryWeek; } - public Long getDeliveryWeek() + public Long getDeliveryWeek() { return deliveryWeek; } - public void setFormalDeliveryDate(Date formalDeliveryDate) + public void setFormalDeliveryDate(Date formalDeliveryDate) { this.formalDeliveryDate = formalDeliveryDate; } - public Date getFormalDeliveryDate() + public Date getFormalDeliveryDate() { return formalDeliveryDate; } - public void setOrdPlanDate(Date ordPlanDate) + public void setOrdPlanDate(Date ordPlanDate) { this.ordPlanDate = ordPlanDate; } - public Date getOrdPlanDate() + public Date getOrdPlanDate() { return ordPlanDate; } - public void setSalesAssistantCode(String salesAssistantCode) + public void setSalesAssistantCode(String salesAssistantCode) { this.salesAssistantCode = salesAssistantCode; } - public String getSalesAssistantCode() + public String getSalesAssistantCode() { return salesAssistantCode; } - public void setSalesAssistantName(String salesAssistantName) + public void setSalesAssistantName(String salesAssistantName) { this.salesAssistantName = salesAssistantName; } - public String getSalesAssistantName() + public String getSalesAssistantName() { return salesAssistantName; } - public void setPmCode(String pmCode) + public void setPmCode(String pmCode) { this.pmCode = pmCode; } - public String getPmCode() + public String getPmCode() { return pmCode; } - public void setPmName(String pmName) + public void setPmName(String pmName) { this.pmName = pmName; } - public String getPmName() + public String getPmName() { return pmName; } - public void setIsFirstOrder(String isFirstOrder) + public void setIsFirstOrder(String isFirstOrder) { this.isFirstOrder = isFirstOrder; } - public String getIsFirstOrder() + public String getIsFirstOrder() { return isFirstOrder; } - public void setIsPlanZero(String isPlanZero) + public void setIsPlanZero(String isPlanZero) { this.isPlanZero = isPlanZero; } - public String getIsPlanZero() + public String getIsPlanZero() { return isPlanZero; } - public void setIsStraight(String isStraight) + public void setIsStraight(String isStraight) { this.isStraight = isStraight; } - public String getIsStraight() + public String getIsStraight() { return isStraight; } - public void setProductionMothod(String productionMothod) + public void setProductionMothod(String productionMothod) { this.productionMothod = productionMothod; } - public String getProductionMothod() + public String getProductionMothod() { return productionMothod; } - public void setSupplierCode(String supplierCode) + public void setSupplierCode(String supplierCode) { this.supplierCode = supplierCode; } - public String getSupplierCode() + public String getSupplierCode() { return supplierCode; } - public void setSupplierName(String supplierName) + public void setSupplierName(String supplierName) { this.supplierName = supplierName; } - public String getSupplierName() + public String getSupplierName() { return supplierName; } - public void setOrderStage(String orderStage) + public void setOrderStage(String orderStage) { this.orderStage = orderStage; } - public String getOrderStage() + public String getOrderStage() { return orderStage; } - public void setOrderType(String orderType) + public void setOrderType(String orderType) { this.orderType = orderType; } - public String getOrderType() + public String getOrderType() { return orderType; } - public void setAbnormalInfo(String abnormalInfo) + public void setAbnormalInfo(String abnormalInfo) { this.abnormalInfo = abnormalInfo; } - public String getAbnormalInfo() + public String getAbnormalInfo() { return abnormalInfo; } - public void setAbnormalSpec(String abnormalSpec) + public void setAbnormalSpec(String abnormalSpec) { this.abnormalSpec = abnormalSpec; } - public String getAbnormalSpec() + public String getAbnormalSpec() { return abnormalSpec; } - public void setShelfMaterial(String shelfMaterial) + public void setShelfMaterial(String shelfMaterial) { this.shelfMaterial = shelfMaterial; } - public String getShelfMaterial() + public String getShelfMaterial() { return shelfMaterial; } - public void setFeedbackMarket(String feedbackMarket) + public void setFeedbackMarket(String feedbackMarket) { this.feedbackMarket = feedbackMarket; } - public String getFeedbackMarket() + public String getFeedbackMarket() { return feedbackMarket; } - public void setDetailStatus(String detailStatus) + public void setDetailStatus(String detailStatus) { this.detailStatus = detailStatus; } - public String getDetailStatus() + public String getDetailStatus() { return detailStatus; } - public void setDelFlag(String delFlag) + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getDelFlag() + public String getDelFlag() { return delFlag; } @@ -816,71 +878,71 @@ public class DhcRollPlanDetail extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("rollPlanDetailId", getRollPlanDetailId()) - .append("rollPlanId", getRollPlanId()) - .append("rollPlanNum", getRollPlanNum()) - .append("rollPlanNo", getRollPlanNo()) - .append("completeMachineCode", getCompleteMachineCode()) - .append("planVersion", getPlanVersion()) - .append("planInout", getPlanInout()) - .append("countryCode", getCountryCode()) - .append("countryName", getCountryName()) - .append("dealerCode", getDealerCode()) - .append("dealerName", getDealerName()) - .append("areaCodeLarge", getAreaCodeLarge()) - .append("areaNameLarge", getAreaNameLarge()) - .append("areaCodeSmall", getAreaCodeSmall()) - .append("areaNameSmall", getAreaNameSmall()) - .append("deptEmpCode", getDeptEmpCode()) - .append("deptEmpName", getDeptEmpName()) - .append("internalModel", getInternalModel()) - .append("customerModel", getCustomerModel()) - .append("planQuantity", getPlanQuantity()) - .append("planQuantityPre", getPlanQuantityPre()) - .append("formalPlanQuantity", getFormalPlanQuantity()) - .append("productCategoryLarge", getProductCategoryLarge()) - .append("productCategoryMiddle", getProductCategoryMiddle()) - .append("productCategorySmall", getProductCategorySmall()) - .append("productCategory", getProductCategory()) - .append("productSize", getProductSize()) - .append("productionBaseCode", getProductionBaseCode()) - .append("productionBaseName", getProductionBaseName()) - .append("packWayCode", getPackWayCode()) - .append("packWayName", getPackWayName()) - .append("contractNum", getContractNum()) - .append("brandCode", getBrandCode()) - .append("brandName", getBrandName()) - .append("productionDate", getProductionDate()) - .append("productionYear", getProductionYear()) - .append("productionWeek", getProductionWeek()) - .append("deliveryDate", getDeliveryDate()) - .append("deliveryDatePre", getDeliveryDatePre()) - .append("deliveryYear", getDeliveryYear()) - .append("deliveryWeek", getDeliveryWeek()) - .append("formalDeliveryDate", getFormalDeliveryDate()) - .append("ordPlanDate", getOrdPlanDate()) - .append("salesAssistantCode", getSalesAssistantCode()) - .append("salesAssistantName", getSalesAssistantName()) - .append("pmCode", getPmCode()) - .append("pmName", getPmName()) - .append("isFirstOrder", getIsFirstOrder()) - .append("isPlanZero", getIsPlanZero()) - .append("isStraight", getIsStraight()) - .append("productionMothod", getProductionMothod()) - .append("supplierCode", getSupplierCode()) - .append("supplierName", getSupplierName()) - .append("orderStage", getOrderStage()) - .append("orderType", getOrderType()) - .append("abnormalInfo", getAbnormalInfo()) - .append("abnormalSpec", getAbnormalSpec()) - .append("shelfMaterial", getShelfMaterial()) - .append("feedbackMarket", getFeedbackMarket()) - .append("detailStatus", getDetailStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} + .append("rollPlanDetailId", getRollPlanDetailId()) + .append("rollPlanId", getRollPlanId()) + .append("rollPlanNum", getRollPlanNum()) + .append("rollPlanNo", getRollPlanNo()) + .append("completeMachineCode", getCompleteMachineCode()) + .append("planVersion", getPlanVersion()) + .append("planInout", getPlanInout()) + .append("countryCode", getCountryCode()) + .append("countryName", getCountryName()) + .append("dealerCode", getDealerCode()) + .append("dealerName", getDealerName()) + .append("areaCodeLarge", getAreaCodeLarge()) + .append("areaNameLarge", getAreaNameLarge()) + .append("areaCodeSmall", getAreaCodeSmall()) + .append("areaNameSmall", getAreaNameSmall()) + .append("deptEmpCode", getDeptEmpCode()) + .append("deptEmpName", getDeptEmpName()) + .append("internalModel", getInternalModel()) + .append("customerModel", getCustomerModel()) + .append("planQuantity", getPlanQuantity()) + .append("planQuantityPre", getPlanQuantityPre()) + .append("formalPlanQuantity", getFormalPlanQuantity()) + .append("productCategoryLarge", getProductCategoryLarge()) + .append("productCategoryMiddle", getProductCategoryMiddle()) + .append("productCategorySmall", getProductCategorySmall()) + .append("productCategory", getProductCategory()) + .append("productSize", getProductSize()) + .append("productionBaseCode", getProductionBaseCode()) + .append("productionBaseName", getProductionBaseName()) + .append("packWayCode", getPackWayCode()) + .append("packWayName", getPackWayName()) + .append("contractNum", getContractNum()) + .append("brandCode", getBrandCode()) + .append("brandName", getBrandName()) + .append("productionDate", getProductionDate()) + .append("productionYear", getProductionYear()) + .append("productionWeek", getProductionWeek()) + .append("deliveryDate", getDeliveryDate()) + .append("deliveryDatePre", getDeliveryDatePre()) + .append("deliveryYear", getDeliveryYear()) + .append("deliveryWeek", getDeliveryWeek()) + .append("formalDeliveryDate", getFormalDeliveryDate()) + .append("ordPlanDate", getOrdPlanDate()) + .append("salesAssistantCode", getSalesAssistantCode()) + .append("salesAssistantName", getSalesAssistantName()) + .append("pmCode", getPmCode()) + .append("pmName", getPmName()) + .append("isFirstOrder", getIsFirstOrder()) + .append("isPlanZero", getIsPlanZero()) + .append("isStraight", getIsStraight()) + .append("productionMothod", getProductionMothod()) + .append("supplierCode", getSupplierCode()) + .append("supplierName", getSupplierName()) + .append("orderStage", getOrderStage()) + .append("orderType", getOrderType()) + .append("abnormalInfo", getAbnormalInfo()) + .append("abnormalSpec", getAbnormalSpec()) + .append("shelfMaterial", getShelfMaterial()) + .append("feedbackMarket", getFeedbackMarket()) + .append("detailStatus", getDetailStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} \ No newline at end of file diff --git a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanDetailRecord.java b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanDetailRecord.java index 330b617..cef42c8 100644 --- a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanDetailRecord.java +++ b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanDetailRecord.java @@ -6,13 +6,16 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; /** * 滚动计划明细历史记录对象 dhc_roll_plan_detail_record - * + * * @author ruoyi * @date 2024-09-23 */ +@ApiModel(value = "DhcRollPlanDetailRecord", description = "滚动计划明细历史记录") public class DhcRollPlanDetailRecord extends BaseEntity { private static final long serialVersionUID = 1L; @@ -21,820 +24,881 @@ public class DhcRollPlanDetailRecord extends BaseEntity private Long rollPlanDetailRecordId; /** 滚动计划明细id */ + @ApiModelProperty("滚动计划明细id") @Excel(name = "滚动计划明细id") private Long rollPlanDetailId; /** 滚动计划id */ + @ApiModelProperty("滚动计划id") @Excel(name = "滚动计划id") private Long rollPlanId; /** 滚动计划号 */ + @ApiModelProperty("滚动计划号") @Excel(name = "滚动计划号") private String rollPlanNum; /** 滚动计划序号 */ + @ApiModelProperty("滚动计划序号") @Excel(name = "滚动计划序号") private String rollPlanNo; /** 整机编码 */ + @ApiModelProperty("整机编码") @Excel(name = "整机编码") private String completeMachineCode; /** 计划版本（排产计划导入的） */ + @ApiModelProperty("计划版本（排产计划导入的）") @Excel(name = "计划版本", readConverterExp = "排=产计划导入的") private String planVersion; /** 计划内/计划外（Y/N） */ + @ApiModelProperty("计划内/计划外（Y/N）") @Excel(name = "计划内/计划外", readConverterExp = "Y=/N") private String planInout; /** 国家编码 */ + @ApiModelProperty("国家编码") @Excel(name = "国家编码") private String countryCode; /** 国家名称 */ + @ApiModelProperty("国家名称") @Excel(name = "国家名称") private String countryName; /** 客户编码 */ + @ApiModelProperty("客户编码") @Excel(name = "客户编码") private String dealerCode; /** 客户名称 */ + @ApiModelProperty("客户名称") @Excel(name = "客户名称") private String dealerName; /** 销售大区编码 */ + @ApiModelProperty("销售大区编码") @Excel(name = "销售大区编码") private String areaCodeLarge; /** 销售大区名称 */ + @ApiModelProperty("销售大区名称") @Excel(name = "销售大区名称") private String areaNameLarge; /** 销售小区编码 */ + @ApiModelProperty("销售小区编码") @Excel(name = "销售小区编码") private String areaCodeSmall; /** 销售小区名称 */ + @ApiModelProperty("销售小区名称") @Excel(name = "销售小区名称") private String areaNameSmall; /** 业务线负责人编号 */ + @ApiModelProperty("业务线负责人编号") @Excel(name = "业务线负责人编号") private String deptEmpCode; /** 业务线负责人名称 */ + @ApiModelProperty("业务线负责人名称") @Excel(name = "业务线负责人名称") private String deptEmpName; /** 内部型号 */ + @ApiModelProperty("内部型号") @Excel(name = "内部型号") private String internalModel; /** 客户型号 */ + @ApiModelProperty("客户型号") @Excel(name = "客户型号") private String customerModel; /** 计划数量 */ + @ApiModelProperty("计划数量") @Excel(name = "计划数量") private Long planQuantity; /** 计划数量（N-1周） */ + @ApiModelProperty("计划数量（N-1周）") @Excel(name = "计划数量", readConverterExp = "N=-1周") private Long planQuantityPre; /** 正式版计划数量 */ + @ApiModelProperty("正式版计划数量") @Excel(name = "正式版计划数量") private Long formalPlanQuantity; /** 产品大类编码 */ + @ApiModelProperty("产品大类编码") @Excel(name = "产品大类编码") private String productCategoryLarge; /** 产品中类编码 */ + @ApiModelProperty("产品中类编码") @Excel(name = "产品中类编码") private String productCategoryMiddle; /** 产品小类编码 */ + @ApiModelProperty("产品小类编码") @Excel(name = "产品小类编码") private String productCategorySmall; /** 产品品类 */ + @ApiModelProperty("产品品类") @Excel(name = "产品品类") private String productCategory; /** 产品系列 */ + @ApiModelProperty("产品系列") @Excel(name = "产品系列") private String productSeries; /** 尺寸 */ + @ApiModelProperty("尺寸") @Excel(name = "尺寸") private String productSize; /** 生产基地编码 */ + @ApiModelProperty("生产基地编码") @Excel(name = "生产基地编码") private String productionBaseCode; /** 生产基地名称 */ + @ApiModelProperty("生产基地名称") @Excel(name = "生产基地名称") private String productionBaseName; /** 包装方式编码 */ + @ApiModelProperty("包装方式编码") @Excel(name = "包装方式编码") private String packWayCode; /** 包装方式名称 */ + @ApiModelProperty("包装方式名称") @Excel(name = "包装方式名称") private String packWayName; /** 合同号 */ + @ApiModelProperty("合同号") @Excel(name = "合同号") private String contractNum; /** 品牌编码 */ + @ApiModelProperty("品牌编码") @Excel(name = "品牌编码") private String brandCode; /** 品牌名称 */ + @ApiModelProperty("品牌名称") @Excel(name = "品牌名称") private String brandName; /** 生产日期 */ + @ApiModelProperty("生产日期") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") private Date productionDate; /** 生产年 */ + @ApiModelProperty("生产年") @Excel(name = "生产年") private Long productionYear; /** 生产周 */ + @ApiModelProperty("生产周") @Excel(name = "生产周") private Long productionWeek; /** 交货日期 */ + @ApiModelProperty("交货日期") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "交货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date deliveryDate; /** 交货日期（N-1周） */ + @ApiModelProperty("交货日期（N-1周）") @Excel(name = "交货日期", readConverterExp = "N=-1周") private Date deliveryDatePre; /** 交货年 */ + @ApiModelProperty("交货年") @Excel(name = "交货年") private Long deliveryYear; /** 交货周 */ + @ApiModelProperty("交货周") @Excel(name = "交货周") private Long deliveryWeek; /** 正式版交货日期 */ + @ApiModelProperty("正式版交货日期") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "正式版交货日期", width = 30, dateFormat = "yyyy-MM-dd") private Date formalDeliveryDate; /** 排定日期 */ + @ApiModelProperty("排定日期") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "排定日期", width = 30, dateFormat = "yyyy-MM-dd") private Date ordPlanDate; /** 销售协调编码 */ + @ApiModelProperty("销售协调编码") @Excel(name = "销售协调编码") private String salesAssistantCode; /** 销售协调名称 */ + @ApiModelProperty("销售协调名称") @Excel(name = "销售协调名称") private String salesAssistantName; /** 项目经理编码 */ + @ApiModelProperty("项目经理编码") @Excel(name = "项目经理编码") private String pmCode; /** 项目经理名称 */ + @ApiModelProperty("项目经理名称") @Excel(name = "项目经理名称") private String pmName; /** 是否首单（0.否 1.是） */ + @ApiModelProperty("是否首单（0.否 1.是）") @Excel(name = "是否首单", readConverterExp = "0=.否,1=.是") private String isFirstOrder; /** 是否零号计划（0.否 1.是） */ + @ApiModelProperty("是否零号计划（0.否 1.是）") @Excel(name = "是否零号计划", readConverterExp = "0=.否,1=.是") private String isPlanZero; /** 是否直发（0.否 1.是） */ + @ApiModelProperty("是否直发（0.否 1.是）") @Excel(name = "是否直发", readConverterExp = "0=.否,1=.是") private String isStraight; /** 生产方式（0.自制 1.ODM） */ + @ApiModelProperty("生产方式（0.自制 1.ODM）") @Excel(name = "生产方式", readConverterExp = "0=.自制,1=.ODM") private String productionMothod; /** 供应商编码 */ + @ApiModelProperty("供应商编码") @Excel(name = "供应商编码") private String supplierCode; /** 供应商名称 */ + @ApiModelProperty("供应商名称") @Excel(name = "供应商名称") private String supplierName; /** 订单阶段 */ + @ApiModelProperty("订单阶段") @Excel(name = "订单阶段") private String orderStage; /** 订单类别（A,B，C） */ + @ApiModelProperty("订单类别（A,B，C）") @Excel(name = "订单类别", readConverterExp = "A=,B，C") private String orderType; /** 异常信息 */ + @ApiModelProperty("异常信息") @Excel(name = "异常信息") private String abnormalInfo; /** 异常信息说明 */ + @ApiModelProperty("异常信息说明") @Excel(name = "异常信息说明") private String abnormalSpec; /** 当地自制物料 */ + @ApiModelProperty("当地自制物料") @Excel(name = "当地自制物料") private String shelfMaterial; /** 市场反馈 */ + @ApiModelProperty("市场反馈") @Excel(name = "市场反馈") private String feedbackMarket; /** 计划明细状态（0初始化 1已提交 2已审核 3评审版已发布 4.正式版已发布 5.待市场反馈 6.已应答不满足） */ + @ApiModelProperty("计划明细状态（0初始化 1已提交 2已审核 3评审版已发布 4.正式版已发布 5.待市场反馈 6.已应答不满足）") @Excel(name = "计划明细状态", readConverterExp = "0=初始化,1=已提交,2=已审核,3=评审版已发布,4=.正式版已发布,5=.待市场反馈,6=.已应答不满足") private String detailStatus; /** 删除标志（0代表存在 1代表删除） */ private String delFlag; - public void setRollPlanDetailRecordId(Long rollPlanDetailRecordId) + public void setRollPlanDetailRecordId(Long rollPlanDetailRecordId) { this.rollPlanDetailRecordId = rollPlanDetailRecordId; } - public Long getRollPlanDetailRecordId() + public Long getRollPlanDetailRecordId() { return rollPlanDetailRecordId; } - public void setRollPlanDetailId(Long rollPlanDetailId) + public void setRollPlanDetailId(Long rollPlanDetailId) { this.rollPlanDetailId = rollPlanDetailId; } - public Long getRollPlanDetailId() + public Long getRollPlanDetailId() { return rollPlanDetailId; } - public void setRollPlanId(Long rollPlanId) + public void setRollPlanId(Long rollPlanId) { this.rollPlanId = rollPlanId; } - public Long getRollPlanId() + public Long getRollPlanId() { return rollPlanId; } - public void setRollPlanNum(String rollPlanNum) + public void setRollPlanNum(String rollPlanNum) { this.rollPlanNum = rollPlanNum; } - public String getRollPlanNum() + public String getRollPlanNum() { return rollPlanNum; } - public void setRollPlanNo(String rollPlanNo) + public void setRollPlanNo(String rollPlanNo) { this.rollPlanNo = rollPlanNo; } - public String getRollPlanNo() + public String getRollPlanNo() { return rollPlanNo; } - public void setCompleteMachineCode(String completeMachineCode) + public void setCompleteMachineCode(String completeMachineCode) { this.completeMachineCode = completeMachineCode; } - public String getCompleteMachineCode() + public String getCompleteMachineCode() { return completeMachineCode; } - public void setPlanVersion(String planVersion) + public void setPlanVersion(String planVersion) { this.planVersion = planVersion; } - public String getPlanVersion() + public String getPlanVersion() { return planVersion; } - public void setPlanInout(String planInout) + public void setPlanInout(String planInout) { this.planInout = planInout; } - public String getPlanInout() + public String getPlanInout() { return planInout; } - public void setCountryCode(String countryCode) + public void setCountryCode(String countryCode) { this.countryCode = countryCode; } - public String getCountryCode() + public String getCountryCode() { return countryCode; } - public void setCountryName(String countryName) + public void setCountryName(String countryName) { this.countryName = countryName; } - public String getCountryName() + public String getCountryName() { return countryName; } - public void setDealerCode(String dealerCode) + public void setDealerCode(String dealerCode) { this.dealerCode = dealerCode; } - public String getDealerCode() + public String getDealerCode() { return dealerCode; } - public void setDealerName(String dealerName) + public void setDealerName(String dealerName) { this.dealerName = dealerName; } - public String getDealerName() + public String getDealerName() { return dealerName; } - public void setAreaCodeLarge(String areaCodeLarge) + public void setAreaCodeLarge(String areaCodeLarge) { this.areaCodeLarge = areaCodeLarge; } - public String getAreaCodeLarge() + public String getAreaCodeLarge() { return areaCodeLarge; } - public void setAreaNameLarge(String areaNameLarge) + public void setAreaNameLarge(String areaNameLarge) { this.areaNameLarge = areaNameLarge; } - public String getAreaNameLarge() + public String getAreaNameLarge() { return areaNameLarge; } - public void setAreaCodeSmall(String areaCodeSmall) + public void setAreaCodeSmall(String areaCodeSmall) { this.areaCodeSmall = areaCodeSmall; } - public String getAreaCodeSmall() + public String getAreaCodeSmall() { return areaCodeSmall; } - public void setAreaNameSmall(String areaNameSmall) + public void setAreaNameSmall(String areaNameSmall) { this.areaNameSmall = areaNameSmall; } - public String getAreaNameSmall() + public String getAreaNameSmall() { return areaNameSmall; } - public void setDeptEmpCode(String deptEmpCode) + public void setDeptEmpCode(String deptEmpCode) { this.deptEmpCode = deptEmpCode; } - public String getDeptEmpCode() + public String getDeptEmpCode() { return deptEmpCode; } - public void setDeptEmpName(String deptEmpName) + public void setDeptEmpName(String deptEmpName) { this.deptEmpName = deptEmpName; } - public String getDeptEmpName() + public String getDeptEmpName() { return deptEmpName; } - public void setInternalModel(String internalModel) + public void setInternalModel(String internalModel) { this.internalModel = internalModel; } - public String getInternalModel() + public String getInternalModel() { return internalModel; } - public void setCustomerModel(String customerModel) + public void setCustomerModel(String customerModel) { this.customerModel = customerModel; } - public String getCustomerModel() + public String getCustomerModel() { return customerModel; } - public void setPlanQuantity(Long planQuantity) + public void setPlanQuantity(Long planQuantity) { this.planQuantity = planQuantity; } - public Long getPlanQuantity() + public Long getPlanQuantity() { return planQuantity; } - public void setPlanQuantityPre(Long planQuantityPre) + public void setPlanQuantityPre(Long planQuantityPre) { this.planQuantityPre = planQuantityPre; } - public Long getPlanQuantityPre() + public Long getPlanQuantityPre() { return planQuantityPre; } - public void setFormalPlanQuantity(Long formalPlanQuantity) + public void setFormalPlanQuantity(Long formalPlanQuantity) { this.formalPlanQuantity = formalPlanQuantity; } - public Long getFormalPlanQuantity() + public Long getFormalPlanQuantity() { return formalPlanQuantity; } - public void setProductCategoryLarge(String productCategoryLarge) + public void setProductCategoryLarge(String productCategoryLarge) { this.productCategoryLarge = productCategoryLarge; } - public String getProductCategoryLarge() + public String getProductCategoryLarge() { return productCategoryLarge; } - public void setProductCategoryMiddle(String productCategoryMiddle) + public void setProductCategoryMiddle(String productCategoryMiddle) { this.productCategoryMiddle = productCategoryMiddle; } - public String getProductCategoryMiddle() + public String getProductCategoryMiddle() { return productCategoryMiddle; } - public void setProductCategorySmall(String productCategorySmall) + public void setProductCategorySmall(String productCategorySmall) { this.productCategorySmall = productCategorySmall; } - public String getProductCategorySmall() + public String getProductCategorySmall() { return productCategorySmall; } - public void setProductCategory(String productCategory) + public void setProductCategory(String productCategory) { this.productCategory = productCategory; } - public String getProductCategory() + public String getProductCategory() { return productCategory; } - public void setProductSeries(String productSeries) + public void setProductSeries(String productSeries) { this.productSeries = productSeries; } - public String getProductSeries() + public String getProductSeries() { return productSeries; } - public void setProductSize(String productSize) + public void setProductSize(String productSize) { this.productSize = productSize; } - public String getProductSize() + public String getProductSize() { return productSize; } - public void setProductionBaseCode(String productionBaseCode) + public void setProductionBaseCode(String productionBaseCode) { this.productionBaseCode = productionBaseCode; } - public String getProductionBaseCode() + public String getProductionBaseCode() { return productionBaseCode; } - public void setProductionBaseName(String productionBaseName) + public void setProductionBaseName(String productionBaseName) { this.productionBaseName = productionBaseName; } - public String getProductionBaseName() + public String getProductionBaseName() { return productionBaseName; } - public void setPackWayCode(String packWayCode) + public void setPackWayCode(String packWayCode) { this.packWayCode = packWayCode; } - public String getPackWayCode() + public String getPackWayCode() { return packWayCode; } - public void setPackWayName(String packWayName) + public void setPackWayName(String packWayName) { this.packWayName = packWayName; } - public String getPackWayName() + public String getPackWayName() { return packWayName; } - public void setContractNum(String contractNum) + public void setContractNum(String contractNum) { this.contractNum = contractNum; } - public String getContractNum() + public String getContractNum() { return contractNum; } - public void setBrandCode(String brandCode) + public void setBrandCode(String brandCode) { this.brandCode = brandCode; } - public String getBrandCode() + public String getBrandCode() { return brandCode; } - public void setBrandName(String brandName) + public void setBrandName(String brandName) { this.brandName = brandName; } - public String getBrandName() + public String getBrandName() { return brandName; } - public void setProductionDate(Date productionDate) + public void setProductionDate(Date productionDate) { this.productionDate = productionDate; } - public Date getProductionDate() + public Date getProductionDate() { return productionDate; } - public void setProductionYear(Long productionYear) + public void setProductionYear(Long productionYear) { this.productionYear = productionYear; } - public Long getProductionYear() + public Long getProductionYear() { return productionYear; } - public void setProductionWeek(Long productionWeek) + public void setProductionWeek(Long productionWeek) { this.productionWeek = productionWeek; } - public Long getProductionWeek() + public Long getProductionWeek() { return productionWeek; } - public void setDeliveryDate(Date deliveryDate) + public void setDeliveryDate(Date deliveryDate) { this.deliveryDate = deliveryDate; } - public Date getDeliveryDate() + public Date getDeliveryDate() { return deliveryDate; } - public void setDeliveryDatePre(Date deliveryDatePre) + public void setDeliveryDatePre(Date deliveryDatePre) { this.deliveryDatePre = deliveryDatePre; } - public Date getDeliveryDatePre() + public Date getDeliveryDatePre() { return deliveryDatePre; } - public void setDeliveryYear(Long deliveryYear) + public void setDeliveryYear(Long deliveryYear) { this.deliveryYear = deliveryYear; } - public Long getDeliveryYear() + public Long getDeliveryYear() { return deliveryYear; } - public void setDeliveryWeek(Long deliveryWeek) + public void setDeliveryWeek(Long deliveryWeek) { this.deliveryWeek = deliveryWeek; } - public Long getDeliveryWeek() + public Long getDeliveryWeek() { return deliveryWeek; } - public void setFormalDeliveryDate(Date formalDeliveryDate) + public void setFormalDeliveryDate(Date formalDeliveryDate) { this.formalDeliveryDate = formalDeliveryDate; } - public Date getFormalDeliveryDate() + public Date getFormalDeliveryDate() { return formalDeliveryDate; } - public void setOrdPlanDate(Date ordPlanDate) + public void setOrdPlanDate(Date ordPlanDate) { this.ordPlanDate = ordPlanDate; } - public Date getOrdPlanDate() + public Date getOrdPlanDate() { return ordPlanDate; } - public void setSalesAssistantCode(String salesAssistantCode) + public void setSalesAssistantCode(String salesAssistantCode) { this.salesAssistantCode = salesAssistantCode; } - public String getSalesAssistantCode() + public String getSalesAssistantCode() { return salesAssistantCode; } - public void setSalesAssistantName(String salesAssistantName) + public void setSalesAssistantName(String salesAssistantName) { this.salesAssistantName = salesAssistantName; } - public String getSalesAssistantName() + public String getSalesAssistantName() { return salesAssistantName; } - public void setPmCode(String pmCode) + public void setPmCode(String pmCode) { this.pmCode = pmCode; } - public String getPmCode() + public String getPmCode() { return pmCode; } - public void setPmName(String pmName) + public void setPmName(String pmName) { this.pmName = pmName; } - public String getPmName() + public String getPmName() { return pmName; } - public void setIsFirstOrder(String isFirstOrder) + public void setIsFirstOrder(String isFirstOrder) { this.isFirstOrder = isFirstOrder; } - public String getIsFirstOrder() + public String getIsFirstOrder() { return isFirstOrder; } - public void setIsPlanZero(String isPlanZero) + public void setIsPlanZero(String isPlanZero) { this.isPlanZero = isPlanZero; } - public String getIsPlanZero() + public String getIsPlanZero() { return isPlanZero; } - public void setIsStraight(String isStraight) + public void setIsStraight(String isStraight) { this.isStraight = isStraight; } - public String getIsStraight() + public String getIsStraight() { return isStraight; } - public void setProductionMothod(String productionMothod) + public void setProductionMothod(String productionMothod) { this.productionMothod = productionMothod; } - public String getProductionMothod() + public String getProductionMothod() { return productionMothod; } - public void setSupplierCode(String supplierCode) + public void setSupplierCode(String supplierCode) { this.supplierCode = supplierCode; } - public String getSupplierCode() + public String getSupplierCode() { return supplierCode; } - public void setSupplierName(String supplierName) + public void setSupplierName(String supplierName) { this.supplierName = supplierName; } - public String getSupplierName() + public String getSupplierName() { return supplierName; } - public void setOrderStage(String orderStage) + public void setOrderStage(String orderStage) { this.orderStage = orderStage; } - public String getOrderStage() + public String getOrderStage() { return orderStage; } - public void setOrderType(String orderType) + public void setOrderType(String orderType) { this.orderType = orderType; } - public String getOrderType() + public String getOrderType() { return orderType; } - public void setAbnormalInfo(String abnormalInfo) + public void setAbnormalInfo(String abnormalInfo) { this.abnormalInfo = abnormalInfo; } - public String getAbnormalInfo() + public String getAbnormalInfo() { return abnormalInfo; } - public void setAbnormalSpec(String abnormalSpec) + public void setAbnormalSpec(String abnormalSpec) { this.abnormalSpec = abnormalSpec; } - public String getAbnormalSpec() + public String getAbnormalSpec() { return abnormalSpec; } - public void setShelfMaterial(String shelfMaterial) + public void setShelfMaterial(String shelfMaterial) { this.shelfMaterial = shelfMaterial; } - public String getShelfMaterial() + public String getShelfMaterial() { return shelfMaterial; } - public void setFeedbackMarket(String feedbackMarket) + public void setFeedbackMarket(String feedbackMarket) { this.feedbackMarket = feedbackMarket; } - public String getFeedbackMarket() + public String getFeedbackMarket() { return feedbackMarket; } - public void setDetailStatus(String detailStatus) + public void setDetailStatus(String detailStatus) { this.detailStatus = detailStatus; } - public String getDetailStatus() + public String getDetailStatus() { return detailStatus; } - public void setDelFlag(String delFlag) + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getDelFlag() + public String getDelFlag() { return delFlag; } @@ -842,73 +906,73 @@ public class DhcRollPlanDetailRecord extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("rollPlanDetailRecordId", getRollPlanDetailRecordId()) - .append("rollPlanDetailId", getRollPlanDetailId()) - .append("rollPlanId", getRollPlanId()) - .append("rollPlanNum", getRollPlanNum()) - .append("rollPlanNo", getRollPlanNo()) - .append("completeMachineCode", getCompleteMachineCode()) - .append("planVersion", getPlanVersion()) - .append("planInout", getPlanInout()) - .append("countryCode", getCountryCode()) - .append("countryName", getCountryName()) - .append("dealerCode", getDealerCode()) - .append("dealerName", getDealerName()) - .append("areaCodeLarge", getAreaCodeLarge()) - .append("areaNameLarge", getAreaNameLarge()) - .append("areaCodeSmall", getAreaCodeSmall()) - .append("areaNameSmall", getAreaNameSmall()) - .append("deptEmpCode", getDeptEmpCode()) - .append("deptEmpName", getDeptEmpName()) - .append("internalModel", getInternalModel()) - .append("customerModel", getCustomerModel()) - .append("planQuantity", getPlanQuantity()) - .append("planQuantityPre", getPlanQuantityPre()) - .append("formalPlanQuantity", getFormalPlanQuantity()) - .append("productCategoryLarge", getProductCategoryLarge()) - .append("productCategoryMiddle", getProductCategoryMiddle()) - .append("productCategorySmall", getProductCategorySmall()) - .append("productCategory", getProductCategory()) - .append("productSeries", getProductSeries()) - .append("productSize", getProductSize()) - .append("productionBaseCode", getProductionBaseCode()) - .append("productionBaseName", getProductionBaseName()) - .append("packWayCode", getPackWayCode()) - .append("packWayName", getPackWayName()) - .append("contractNum", getContractNum()) - .append("brandCode", getBrandCode()) - .append("brandName", getBrandName()) - .append("productionDate", getProductionDate()) - .append("productionYear", getProductionYear()) - .append("productionWeek", getProductionWeek()) - .append("deliveryDate", getDeliveryDate()) - .append("deliveryDatePre", getDeliveryDatePre()) - .append("deliveryYear", getDeliveryYear()) - .append("deliveryWeek", getDeliveryWeek()) - .append("formalDeliveryDate", getFormalDeliveryDate()) - .append("ordPlanDate", getOrdPlanDate()) - .append("salesAssistantCode", getSalesAssistantCode()) - .append("salesAssistantName", getSalesAssistantName()) - .append("pmCode", getPmCode()) - .append("pmName", getPmName()) - .append("isFirstOrder", getIsFirstOrder()) - .append("isPlanZero", getIsPlanZero()) - .append("isStraight", getIsStraight()) - .append("productionMothod", getProductionMothod()) - .append("supplierCode", getSupplierCode()) - .append("supplierName", getSupplierName()) - .append("orderStage", getOrderStage()) - .append("orderType", getOrderType()) - .append("abnormalInfo", getAbnormalInfo()) - .append("abnormalSpec", getAbnormalSpec()) - .append("shelfMaterial", getShelfMaterial()) - .append("feedbackMarket", getFeedbackMarket()) - .append("detailStatus", getDetailStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} + .append("rollPlanDetailRecordId", getRollPlanDetailRecordId()) + .append("rollPlanDetailId", getRollPlanDetailId()) + .append("rollPlanId", getRollPlanId()) + .append("rollPlanNum", getRollPlanNum()) + .append("rollPlanNo", getRollPlanNo()) + .append("completeMachineCode", getCompleteMachineCode()) + .append("planVersion", getPlanVersion()) + .append("planInout", getPlanInout()) + .append("countryCode", getCountryCode()) + .append("countryName", getCountryName()) + .append("dealerCode", getDealerCode()) + .append("dealerName", getDealerName()) + .append("areaCodeLarge", getAreaCodeLarge()) + .append("areaNameLarge", getAreaNameLarge()) + .append("areaCodeSmall", getAreaCodeSmall()) + .append("areaNameSmall", getAreaNameSmall()) + .append("deptEmpCode", getDeptEmpCode()) + .append("deptEmpName", getDeptEmpName()) + .append("internalModel", getInternalModel()) + .append("customerModel", getCustomerModel()) + .append("planQuantity", getPlanQuantity()) + .append("planQuantityPre", getPlanQuantityPre()) + .append("formalPlanQuantity", getFormalPlanQuantity()) + .append("productCategoryLarge", getProductCategoryLarge()) + .append("productCategoryMiddle", getProductCategoryMiddle()) + .append("productCategorySmall", getProductCategorySmall()) + .append("productCategory", getProductCategory()) + .append("productSeries", getProductSeries()) + .append("productSize", getProductSize()) + .append("productionBaseCode", getProductionBaseCode()) + .append("productionBaseName", getProductionBaseName()) + .append("packWayCode", getPackWayCode()) + .append("packWayName", getPackWayName()) + .append("contractNum", getContractNum()) + .append("brandCode", getBrandCode()) + .append("brandName", getBrandName()) + .append("productionDate", getProductionDate()) + .append("productionYear", getProductionYear()) + .append("productionWeek", getProductionWeek()) + .append("deliveryDate", getDeliveryDate()) + .append("deliveryDatePre", getDeliveryDatePre()) + .append("deliveryYear", getDeliveryYear()) + .append("deliveryWeek", getDeliveryWeek()) + .append("formalDeliveryDate", getFormalDeliveryDate()) + .append("ordPlanDate", getOrdPlanDate()) + .append("salesAssistantCode", getSalesAssistantCode()) + .append("salesAssistantName", getSalesAssistantName()) + .append("pmCode", getPmCode()) + .append("pmName", getPmName()) + .append("isFirstOrder", getIsFirstOrder()) + .append("isPlanZero", getIsPlanZero()) + .append("isStraight", getIsStraight()) + .append("productionMothod", getProductionMothod()) + .append("supplierCode", getSupplierCode()) + .append("supplierName", getSupplierName()) + .append("orderStage", getOrderStage()) + .append("orderType", getOrderType()) + .append("abnormalInfo", getAbnormalInfo()) + .append("abnormalSpec", getAbnormalSpec()) + .append("shelfMaterial", getShelfMaterial()) + .append("feedbackMarket", getFeedbackMarket()) + .append("detailStatus", getDetailStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} \ No newline at end of file diff --git a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanTitle.java b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanTitle.java index 2679698..158277c 100644 --- a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanTitle.java +++ b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanTitle.java @@ -1,5 +1,7 @@ package com.ruoyi.dhc.domain; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -11,54 +13,67 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author ruoyi * @date 2024-09-23 */ +@ApiModel(value = "DhcRollPlanTitle", description = "滚动计划头对象") public class DhcRollPlanTitle extends BaseEntity { private static final long serialVersionUID = 1L; /** 滚动计划id */ + @ApiModelProperty("滚动计划id") private Long rollPlanId; /** 产品线编码 */ + @ApiModelProperty("产品线编码") @Excel(name = "产品线编码") private String productLine; /** 产品线名称 */ + @ApiModelProperty("产品线名称") @Excel(name = "产品线名称") private String productLineName; /** 销售大区编码 */ + @ApiModelProperty("销售大区编码") @Excel(name = "销售大区编码") private String areaCodeLarge; /** 销售大区名称 */ + @ApiModelProperty("销售大区名称") @Excel(name = "销售大区名称") private String areaNameLarge; /** 销售小区编码 */ + @ApiModelProperty("销售小区编码") @Excel(name = "销售小区编码") private String areaCodeSmall; /** 销售小区名称 */ + @ApiModelProperty("销售小区名称") @Excel(name = "销售小区名称") private String areaNameSmall; /** 提报年 */ + @ApiModelProperty("提报年") @Excel(name = "提报年") private Long planYear; /** 提报周 */ + @ApiModelProperty("提报周") @Excel(name = "提报周") private Long planWeek; /** 锁定周 */ + @ApiModelProperty("锁定周") @Excel(name = "锁定周") private Long lockWeeks; /** 滚动计划状态（0初始化 1已提交 2已审核 3评审版已发布 4.正式版已发布） */ + @ApiModelProperty("滚动计划状态（0初始化 1已提交 2已审核 3评审版已发布 4.正式版已发布）") @Excel(name = "滚动计划状态", readConverterExp = "0=初始化,1=已提交,2=已审核,3=评审版已发布,4=.正式版已发布") private String status; /** 删除标志（0代表存在 1代表删除） */ + @ApiModelProperty("删除标志（0代表存在 1代表删除）") private String delFlag; public void setRollPlanId(Long rollPlanId) diff --git a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanTitleRecord.java b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanTitleRecord.java index 22b1895..6ea4f84 100644 --- a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanTitleRecord.java +++ b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcRollPlanTitleRecord.java @@ -4,13 +4,16 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; /** * 滚动计划头历史记录对象 dhc_roll_plan_title_record - * + * * @author ruoyi * @date 2024-09-23 */ +@ApiModel(value = "DhcRollPlanTitleRecord", description = "滚动计划头历史记录") public class DhcRollPlanTitleRecord extends BaseEntity { private static final long serialVersionUID = 1L; @@ -19,166 +22,177 @@ public class DhcRollPlanTitleRecord extends BaseEntity private Long rollPlanRecordId; /** 滚动计划id */ + @ApiModelProperty("滚动计划id") @Excel(name = "滚动计划id") private Long rollPlanId; /** 产品线编码 */ + @ApiModelProperty("产品线编码") @Excel(name = "产品线编码") private String productLine; /** 产品线名称 */ + @ApiModelProperty("产品线名称") @Excel(name = "产品线名称") private String productLineName; /** 销售大区编码 */ + @ApiModelProperty("销售大区编码") @Excel(name = "销售大区编码") private String areaCodeLarge; /** 销售大区名称 */ + @ApiModelProperty("销售大区名称") @Excel(name = "销售大区名称") private String areaNameLarge; /** 销售小区编码 */ + @ApiModelProperty("销售小区编码") @Excel(name = "销售小区编码") private String areaCodeSmall; /** 销售小区名称 */ + @ApiModelProperty("销售小区名称") @Excel(name = "销售小区名称") private String areaNameSmall; /** 提报年 */ + @ApiModelProperty("提报年") @Excel(name = "提报年") private Long planYear; /** 提报周 */ + @ApiModelProperty("提报周") @Excel(name = "提报周") private Long planWeek; /** 锁定周 */ + @ApiModelProperty("锁定周") @Excel(name = "锁定周") private Long lockWeeks; /** 滚动计划状态（0初始化 1已提交 2已审核 3评审版已发布 4.正式版已发布） */ + @ApiModelProperty("滚动计划状态（0初始化 1已提交 2已审核 3评审版已发布 4.正式版已发布）") @Excel(name = "滚动计划状态", readConverterExp = "0=初始化,1=已提交,2=已审核,3=评审版已发布,4=.正式版已发布") private String status; /** 删除标志（0代表存在 1代表删除） */ private String delFlag; - public void setRollPlanRecordId(Long rollPlanRecordId) + public void setRollPlanRecordId(Long rollPlanRecordId) { this.rollPlanRecordId = rollPlanRecordId; } - public Long getRollPlanRecordId() + public Long getRollPlanRecordId() { return rollPlanRecordId; } - public void setRollPlanId(Long rollPlanId) + public void setRollPlanId(Long rollPlanId) { this.rollPlanId = rollPlanId; } - public Long getRollPlanId() + public Long getRollPlanId() { return rollPlanId; } - public void setProductLine(String productLine) + public void setProductLine(String productLine) { this.productLine = productLine; } - public String getProductLine() + public String getProductLine() { return productLine; } - public void setProductLineName(String productLineName) + public void setProductLineName(String productLineName) { this.productLineName = productLineName; } - public String getProductLineName() + public String getProductLineName() { return productLineName; } - public void setAreaCodeLarge(String areaCodeLarge) + public void setAreaCodeLarge(String areaCodeLarge) { this.areaCodeLarge = areaCodeLarge; } - public String getAreaCodeLarge() + public String getAreaCodeLarge() { return areaCodeLarge; } - public void setAreaNameLarge(String areaNameLarge) + public void setAreaNameLarge(String areaNameLarge) { this.areaNameLarge = areaNameLarge; } - public String getAreaNameLarge() + public String getAreaNameLarge() { return areaNameLarge; } - public void setAreaCodeSmall(String areaCodeSmall) + public void setAreaCodeSmall(String areaCodeSmall) { this.areaCodeSmall = areaCodeSmall; } - public String getAreaCodeSmall() + public String getAreaCodeSmall() { return areaCodeSmall; } - public void setAreaNameSmall(String areaNameSmall) + public void setAreaNameSmall(String areaNameSmall) { this.areaNameSmall = areaNameSmall; } - public String getAreaNameSmall() + public String getAreaNameSmall() { return areaNameSmall; } - public void setPlanYear(Long planYear) + public void setPlanYear(Long planYear) { this.planYear = planYear; } - public Long getPlanYear() + public Long getPlanYear() { return planYear; } - public void setPlanWeek(Long planWeek) + public void setPlanWeek(Long planWeek) { this.planWeek = planWeek; } - public Long getPlanWeek() + public Long getPlanWeek() { return planWeek; } - public void setLockWeeks(Long lockWeeks) + public void setLockWeeks(Long lockWeeks) { this.lockWeeks = lockWeeks; } - public Long getLockWeeks() + public Long getLockWeeks() { return lockWeeks; } - public void setStatus(String status) + public void setStatus(String status) { this.status = status; } - public String getStatus() + public String getStatus() { return status; } - public void setDelFlag(String delFlag) + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getDelFlag() + public String getDelFlag() { return delFlag; } @@ -186,23 +200,23 @@ public class DhcRollPlanTitleRecord extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("rollPlanRecordId", getRollPlanRecordId()) - .append("rollPlanId", getRollPlanId()) - .append("productLine", getProductLine()) - .append("productLineName", getProductLineName()) - .append("areaCodeLarge", getAreaCodeLarge()) - .append("areaNameLarge", getAreaNameLarge()) - .append("areaCodeSmall", getAreaCodeSmall()) - .append("areaNameSmall", getAreaNameSmall()) - .append("planYear", getPlanYear()) - .append("planWeek", getPlanWeek()) - .append("lockWeeks", getLockWeeks()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} + .append("rollPlanRecordId", getRollPlanRecordId()) + .append("rollPlanId", getRollPlanId()) + .append("productLine", getProductLine()) + .append("productLineName", getProductLineName()) + .append("areaCodeLarge", getAreaCodeLarge()) + .append("areaNameLarge", getAreaNameLarge()) + .append("areaCodeSmall", getAreaCodeSmall()) + .append("areaNameSmall", getAreaNameSmall()) + .append("planYear", getPlanYear()) + .append("planWeek", getPlanWeek()) + .append("lockWeeks", getLockWeeks()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} \ No newline at end of file