wilson
/
ccl-plm-java
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024-01-02

master
fengyuan_yang 1 year ago
parent
49846a750f
commit
c1edf92140
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/main/java/com/spring/modules/part/service/impl/RecipeManagementServiceImpl.java

12
src/main/java/com/spring/modules/part/service/impl/RecipeManagementServiceImpl.java
View File

@ -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());

Write Preview
Loading…
Cancel
Save