update 机台料罐明细关联字段

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMachineTankDetail.java

@@ -47,6 +47,27 @@ public class ProdMachineTankDetail extends TenantEntity {
      */
     private Long materialId;
 
+    /**
+     * 物料编码（关联查询，非数据库字段）
+     */
+    @TableField(exist = false)
+    private String materialCode;
+
+    @TableField(exist = false)
+    private String machineName;
+
+    /**
+     * 罐类型
+     */
+    @TableField(exist = false)
+    private String tankType;
+
+    /**
+     * 物料名称（关联查询，非数据库字段）
+     */
+    @TableField(exist = false)
+    private String materialName;
+
     /**
      * 料仓优先级
      */

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMachineTankDetailBo.java

@@ -49,6 +49,18 @@ public class ProdMachineTankDetailBo extends BaseEntity {
     @NotNull(message = "物料ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long materialId;
 
+    /**
+     * 物料编码（关联查询）
+     */
+    private String materialCode;
+
+    /**
+     * 物料名称（关联查询）
+     */
+    private String materialName;
+
+    private String machineName;
+
     /**
      * 料仓优先级
      */
@@ -99,5 +111,8 @@ public class ProdMachineTankDetailBo extends BaseEntity {
      */
     private Long stationId;
 
-
+    /**
+     * 罐类型
+     */
+    private String tankType;
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMachineTankDetailVo.java

@@ -40,12 +40,22 @@ public class ProdMachineTankDetailVo implements Serializable {
     @ExcelProperty(value = "机台ID")
     private String machineId;
 
+    /**
+     * 机台名称
+     */
+    private String machineName;
+
     /**
      * 料罐类型
      */
     @ExcelProperty(value = "料罐类型")
     private Long tankTypeId;
 
+    /**
+     * 罐类型
+     */
+    private String tankType;
+
     /**
      * 仓位序号
      */
@@ -58,6 +68,16 @@ public class ProdMachineTankDetailVo implements Serializable {
     @ExcelProperty(value = "物料ID")
     private Long materialId;
 
+    /**
+     * 物料编码
+     */
+    private String materialCode;
+
+    /**
+     * 物料名称
+     */
+    private String materialName;
+
     /**
      * 料仓优先级
      */

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMachineTankDetailServiceImpl.java

@@ -12,7 +12,10 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.dromara.mes.domain.bo.ProdMachineTankDetailBo;
 import org.dromara.mes.domain.vo.ProdMachineTankDetailVo;
+import org.dromara.mes.domain.BaseMaterialInfo;
+import org.dromara.mes.domain.ProdBaseMachineInfo;
 import org.dromara.mes.domain.ProdMachineTankDetail;
+import org.dromara.mes.domain.ProdMachineTankType;
 import org.dromara.mes.mapper.ProdMachineTankDetailMapper;
 import org.dromara.mes.service.IProdMachineTankDetailService;
 
@@ -40,7 +43,10 @@ public class ProdMachineTankDetailServiceImpl implements IProdMachineTankDetailS
      */
     @Override
     public ProdMachineTankDetailVo queryById(Long tankDetailId){
-        return baseMapper.selectVoById(tankDetailId);
+        ProdMachineTankDetailBo bo = new ProdMachineTankDetailBo();
+        bo.setTankDetailId(tankDetailId);
+        List<ProdMachineTankDetailVo> tankDetailVos = this.queryList(bo);
+        return !tankDetailVos.isEmpty() ? tankDetailVos.get(0) : null;
     }
 
     /**
@@ -73,6 +79,12 @@ public class ProdMachineTankDetailServiceImpl implements IProdMachineTankDetailS
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<ProdMachineTankDetail> lqw = JoinWrappers.lambda(ProdMachineTankDetail.class)
         .selectAll(ProdMachineTankDetail.class)
+        .select(ProdBaseMachineInfo::getMachineName)
+        .leftJoin(ProdBaseMachineInfo.class, ProdBaseMachineInfo::getMachineId, ProdMachineTankDetail::getMachineId)
+        .select(ProdMachineTankType::getTankType)
+        .leftJoin(ProdMachineTankType.class, ProdMachineTankType::getTankTypeId, ProdMachineTankDetail::getTankTypeId)
+        .select(BaseMaterialInfo::getMaterialCode, BaseMaterialInfo::getMaterialName)
+        .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, ProdMachineTankDetail::getMaterialId)
         .eq(bo.getTankDetailId() != null, ProdMachineTankDetail::getTankDetailId, bo.getTankDetailId())
         .eq(StringUtils.isNotBlank(bo.getMachineId()), ProdMachineTankDetail::getMachineId, bo.getMachineId())
         .eq(bo.getTankTypeId() != null, ProdMachineTankDetail::getTankTypeId, bo.getTankTypeId())
@@ -87,6 +99,7 @@ public class ProdMachineTankDetailServiceImpl implements IProdMachineTankDetailS
         .eq(StringUtils.isNotBlank(bo.getStatus()), ProdMachineTankDetail::getStatus, bo.getStatus())
         .eq(bo.getWorkshopId() != null, ProdMachineTankDetail::getWorkshopId, bo.getWorkshopId())
         .eq(bo.getStationId() != null, ProdMachineTankDetail::getStationId, bo.getStationId())
+        .eq(bo.getTankDetailId() != null, ProdMachineTankDetail::getTankDetailId, bo.getTankDetailId())
         .orderByDesc(ProdMachineTankDetail::getCreateTime);
         return lqw;
     }