update mes生产计划显示物料单位信息

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;
 }

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<BaseToolingTypeRelation> relationProcessList = relationMapper.selectList(lqwProcess);
-        System.out.println("工序查询SQL: " + lqwProcess.getSqlSegment());
-        System.out.println("工序查询参数: " + lqwProcess.getParamNameValuePairs());
         baseToolingTypeVo.setProcessList(relationProcessList);
         return baseToolingTypeVo;
     }

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<ProdPlanInfo> dynamicBaseSqlMapper;

ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdPlanInfoMapper.xml

@@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="productionTime" column="production_time"/>
 
         <result property="releaseName" column="release_name"/>
+        <result property="unitName" column="unit_name"/>
     </resultMap>
 
 
@@ -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
         </if>
         <if test="ew.getSqlSelect == null">
             *
         </if>
         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