update 根据配方ID查询配方信息及对应称量、混炼信息

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdRecipeInfoController.java

@@ -18,6 +18,7 @@ import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.mes.domain.vo.ProdRecipeInfoVo;
+import org.dromara.mes.domain.vo.RecipeDetailVo;
 import org.dromara.mes.domain.bo.ProdRecipeInfoBo;
 import org.dromara.mes.domain.bo.RecipeDetailSaveBo;
 import org.dromara.mes.service.IProdRecipeInfoService;
@@ -58,6 +59,18 @@ public class ProdRecipeInfoController extends BaseController {
         ExcelUtil.exportExcel(list, "配方-基础信息", ProdRecipeInfoVo.class, response);
     }
 
+    /**
+     * 根据配方ID查询配方信息及对应称量、混炼信息
+     *
+     * @param recipeId 配方ID
+     * @return 配方明细
+     */
+    @GetMapping("/detail/{recipeId}")
+    public R<RecipeDetailVo> getDetail(@NotNull(message = "配方ID不能为空")
+                                       @PathVariable Long recipeId) {
+        return R.ok(prodRecipeInfoService.queryDetailByRecipeId(recipeId));
+    }
+
     /**
      * 获取配方-基础信息详细信息
      *

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

@@ -2,6 +2,7 @@ package org.dromara.mes.service;
 
 import org.dromara.mes.domain.ProdRecipeInfo;
 import org.dromara.mes.domain.vo.ProdRecipeInfoVo;
+import org.dromara.mes.domain.vo.RecipeDetailVo;
 import org.dromara.mes.domain.bo.ProdRecipeInfoBo;
 import org.dromara.mes.domain.bo.RecipeDetailSaveBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -75,4 +76,12 @@ public interface IProdRecipeInfoService {
      * @return 是否成功
      */
     Boolean saveDetail(RecipeDetailSaveBo bo);
+
+    /**
+     * 根据配方ID查询配方信息
+     *
+     * @param recipeId 配方ID
+     * @return 配方明细
+     */
+    RecipeDetailVo queryDetailByRecipeId(Long recipeId);
 }

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

@@ -16,6 +16,9 @@ import org.dromara.mes.domain.bo.ProdRecipeWeightBo;
 import org.dromara.mes.domain.bo.ProdRecipeMixingBo;
 import org.dromara.mes.domain.bo.RecipeDetailSaveBo;
 import org.dromara.mes.domain.vo.ProdRecipeInfoVo;
+import org.dromara.mes.domain.vo.ProdRecipeWeightVo;
+import org.dromara.mes.domain.vo.ProdRecipeMixingVo;
+import org.dromara.mes.domain.vo.RecipeDetailVo;
 import org.dromara.mes.domain.ProdRecipeInfo;
 import org.dromara.mes.mapper.ProdRecipeInfoMapper;
 import org.dromara.mes.service.IProdRecipeInfoService;
@@ -291,4 +294,21 @@ public class ProdRecipeInfoServiceImpl implements IProdRecipeInfoService {
         return true;
     }
 
+    @Override
+    public RecipeDetailVo queryDetailByRecipeId(Long recipeId) {
+        ProdRecipeInfoVo recipeInfo = queryById(recipeId);
+        if (recipeInfo == null) {
+            return null;
+        }
+        RecipeDetailVo detail = new RecipeDetailVo();
+        detail.setRecipeInfo(recipeInfo);
+        ProdRecipeWeightBo weightQuery = new ProdRecipeWeightBo();
+        weightQuery.setRecipeId(recipeId);
+        detail.setWeightList(prodRecipeWeightService.queryList(weightQuery));
+        ProdRecipeMixingBo mixingQuery = new ProdRecipeMixingBo();
+        mixingQuery.setRecipeId(recipeId);
+        detail.setMixingList(prodRecipeMixingService.queryList(mixingQuery));
+        return detail;
+    }
+
 }