diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java index 0e9471c..6bcab8c 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java @@ -255,4 +255,9 @@ public class ProdPlanInfoVo implements Serializable { @ExcelProperty(value = "班次名称") private String shiftName;// + /** + * 单位名称 + */ + @ExcelProperty(value = "单位名称") + private String unitName; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseToolingTypeServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseToolingTypeServiceImpl.java index bcffb0b..570290e 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseToolingTypeServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseToolingTypeServiceImpl.java @@ -65,8 +65,6 @@ public class BaseToolingTypeServiceImpl implements IBaseToolingTypeService { .eq(BaseToolingTypeRelation::getToolingTypeId, toolingTypeId) .eq(BaseToolingTypeRelation::getRelationInfoType, "2"); List relationProcessList = relationMapper.selectList(lqwProcess); - System.out.println("工序查询SQL: " + lqwProcess.getSqlSegment()); - System.out.println("工序查询参数: " + lqwProcess.getParamNameValuePairs()); baseToolingTypeVo.setProcessList(relationProcessList); return baseToolingTypeVo; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdPlanInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdPlanInfoServiceImpl.java index a8011b4..14788ec 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdPlanInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdPlanInfoServiceImpl.java @@ -53,9 +53,6 @@ public class ProdPlanInfoServiceImpl implements IProdPlanInfoService { private final Logger log = LoggerFactory.getLogger(ProdPlanInfoServiceImpl.class); - - private static final String PLAN_ID_HEADER = "planId"; - private final ProdPlanInfoMapper baseMapper; private final DynamicBaseSqlMapper dynamicBaseSqlMapper; diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdPlanInfoMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdPlanInfoMapper.xml index 9859341..9e24ed6 100644 --- a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdPlanInfoMapper.xml +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdPlanInfoMapper.xml @@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -87,13 +88,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" end as release_name, pbpi.process_name, bsi.shift_name, - bcti.team_name + bcti.team_name, + bmui.unit_name * from ${tableName} t left join base_material_info bmi on bmi.material_id = t.material_id + left join base_measurement_unit_info bmui on bmui.unit_id = bmi.material_unit_id left join prod_material_bom pmb on pmb.material_bom_id = t.material_bom_id left join base_material_info bomi on bomi.material_id = pmb.material_id left join prod_base_process_info pbpi on pbpi.process_id = t.process_id