From c1edf9214083a3e9288f29193106f0600a7bd361 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 2 Jan 2025 10:09:15 +0800
Subject: [PATCH] 2024-01-02

---
 .../service/impl/RecipeManagementServiceImpl.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/RecipeManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/RecipeManagementServiceImpl.java
index 2f5d9a28..372ae375 100644
--- a/src/main/java/com/spring/modules/part/service/impl/RecipeManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/RecipeManagementServiceImpl.java
@@ -129,7 +129,7 @@ public class RecipeManagementServiceImpl extends ServiceImpl<RecipeManagementMap
     public void recipeManagementSave(RecipeAllFieldEntity data) {
         // 修改主表内容
         recipeManagementMapper.updateRecipeHeader(data);
-        RecipeHeaderEntity recipeHeader = recipeManagementMapper.selectOne(new QueryWrapper<RecipeHeaderEntity>().eq("site", data.getSite()).eq("part_no", data.getPartNo()).eq("eng_chg_level", data.getEngChgLevel()).eq("recipe_type", data.getBomType()));
+        RecipeHeaderEntity recipeHeader = recipeManagementMapper.selectOne(new QueryWrapper<RecipeHeaderEntity>().eq("site", data.getSite()).eq("part_no", data.getPartNo()).eq("eng_chg_level", data.getEngChgLevel()).eq("bom_type", data.getBomType()));
 
         if (dataUrl) {
             // 判断是否为正式的recipeHeader
@@ -168,7 +168,7 @@ public class RecipeManagementServiceImpl extends ServiceImpl<RecipeManagementMap
         recipeManagementMapper.updateRecipeHeader(data);
 
         if (dataUrl) {
-            RecipeHeaderEntity recipeHeader = recipeManagementMapper.selectOne(new QueryWrapper<RecipeHeaderEntity>().eq("site", data.getSite()).eq("part_no", data.getPartNo()).eq("eng_chg_level", data.getEngChgLevel()).eq("recipe_type", data.getBomType()));
+            RecipeHeaderEntity recipeHeader = recipeManagementMapper.selectOne(new QueryWrapper<RecipeHeaderEntity>().eq("site", data.getSite()).eq("part_no", data.getPartNo()).eq("eng_chg_level", data.getEngChgLevel()).eq("bom_type", data.getBomType()));
             // 判断是否为正式的recipeHeader
             if ("Y".equals(recipeHeader.getOfficialFlag())) {
                 // 同步ifs
@@ -488,7 +488,7 @@ public class RecipeManagementServiceImpl extends ServiceImpl<RecipeManagementMap
     @Override
     @Transactional
     public Map<String, Object> updateAlternativeStatus (RecipeDetailEntity data) {
-        RecipeHeaderEntity recipeHeader = recipeManagementMapper.selectOne(new QueryWrapper<RecipeHeaderEntity>().eq("site", data.getSite()).eq("part_no", data.getPartNo()).eq("eng_chg_level", data.getEngChgLevel()).eq("recipe_type", data.getBomType()));
+        RecipeHeaderEntity recipeHeader = recipeManagementMapper.selectOne(new QueryWrapper<RecipeHeaderEntity>().eq("site", data.getSite()).eq("part_no", data.getPartNo()).eq("eng_chg_level", data.getEngChgLevel()).eq("bom_type", data.getBomType()));
 
         // 如果是Build,则校验日期是否重叠和重量配比是否为100
         if ("Tentative".equals(data.getStatus())) {
@@ -498,7 +498,7 @@ public class RecipeManagementServiceImpl extends ServiceImpl<RecipeManagementMap
                 throw new RuntimeException("重量分配总额必须为100!");
             }
 
-            List<RecipeHeaderEntity> historyRecipe = recipeManagementMapper.selectList(new QueryWrapper<RecipeHeaderEntity>().eq("site", data.getSite()).eq("part_no", data.getPartNo()).eq("recipe_type", data.getBomType()));
+            List<RecipeHeaderEntity> historyRecipe = recipeManagementMapper.selectList(new QueryWrapper<RecipeHeaderEntity>().eq("site", data.getSite()).eq("part_no", data.getPartNo()).eq("bom_type", data.getBomType()));
             Date newEffPhaseInDate = recipeHeader.getEffPhaseInDate();
             Date newEffPhaseOutDate = recipeHeader.getEffPhaseOutDate();
             // 过滤掉自己
@@ -1070,7 +1070,7 @@ public class RecipeManagementServiceImpl extends ServiceImpl<RecipeManagementMap
             throw new RuntimeException("物料不存在！");
         }
         // 校验recipe是否存在
-        RecipeHeaderEntity recipeHeaderEntity = recipeManagementMapper.selectOne(new QueryWrapper<RecipeHeaderEntity>().eq("site", data.getSite()).eq("part_no", data.getPartNo()).eq("eng_chg_level", data.getEngChgLevel()).eq("recipe_type", data.getBomType()));
+        RecipeHeaderEntity recipeHeaderEntity = recipeManagementMapper.selectOne(new QueryWrapper<RecipeHeaderEntity>().eq("site", data.getSite()).eq("part_no", data.getPartNo()).eq("eng_chg_level", data.getEngChgLevel()).eq("bom_type", data.getBomType()));
         if (recipeHeaderEntity == null) {
             throw new RuntimeException("Recipe不存在！");
         }
@@ -1143,7 +1143,7 @@ public class RecipeManagementServiceImpl extends ServiceImpl<RecipeManagementMap
         if (dataUrl) {
             // 判断是否已同步RecipeHeader
             Server srv = getIfsServer(data.getUpdateBy());
-            RecipeHeaderEntity recipeHeader = recipeManagementMapper.selectOne(new QueryWrapper<RecipeHeaderEntity>().eq("site", data.getSite()).eq("part_no", data.getPartNo()).eq("eng_chg_level", data.getEngChgLevel()).eq("recipe_type", data.getBomType()));
+            RecipeHeaderEntity recipeHeader = recipeManagementMapper.selectOne(new QueryWrapper<RecipeHeaderEntity>().eq("site", data.getSite()).eq("part_no", data.getPartNo()).eq("eng_chg_level", data.getEngChgLevel()).eq("bom_type", data.getBomType()));
             RecipeIfsHeader recipeIfsHeader = new RecipeIfsHeader();
             recipeIfsHeader.setContract(data.getSite());
             recipeIfsHeader.setPartNo(data.getPartNo());