diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java index 1cf42d5c..27acd10f 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java @@ -80,5 +80,15 @@ public class BaseMaterialType extends TenantEntity { @TableField(exist = false) private String processName;//映射字段 + /** + * 大类编号 + */ +/* @TableField(exist = false) + private String materialCategoryCode;//映射字段*/ + /** + * 大类名称 + */ + @TableField(exist = false) + private String materialCategoryName;//映射字段 } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java index 20bf198a..cdd868af 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java @@ -131,8 +131,12 @@ public class BaseMaterialTypeVo implements Serializable { /** * 工序名称 */ - @ExcelProperty(value = "工序名称") - private String processName;//工序名称 - +// @ExcelProperty(value = "工序名称") +// private String processName;//工序名称 + /** + * 大类名称 + */ + @ExcelProperty(value = "工序名称") + private String materialCategoryName;//映射字段 } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java index 022debdb..c11a292f 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java @@ -8,6 +8,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.mes.domain.BaseMaterialCategory; import org.dromara.mes.domain.ProdBaseProcessInfo; import org.springframework.stereotype.Service; import org.dromara.mes.domain.bo.BaseMaterialTypeBo; @@ -61,8 +62,12 @@ public class BaseMaterialTypeServiceImpl implements IBaseMaterialTypeService { MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseMaterialType.class) // 关联查询工序名称 - .select(ProdBaseProcessInfo::getProcessName) - .leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, BaseMaterialType::getProcessId) +// .select(ProdBaseProcessInfo::getProcessName) +// .leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, BaseMaterialType::getProcessId) + + // 关联查询物料大类名称 + .select(BaseMaterialCategory::getMaterialCategoryName) + .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, BaseMaterialType::getMaterialCategoryId) .selectAll(BaseMaterialType.class) .eq(bo.getMatrialTypeId() != null, BaseMaterialType::getMatrialTypeId, bo.getMatrialTypeId())