From 2625956e09fa636afa313a84dfd902accf8e25e4 Mon Sep 17 00:00:00 2001 From: jing's Date: Wed, 10 Jan 2024 22:24:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/api/user/OptionalEbomApi.java | 24 +++++++++-- .../mapper/master/MaterialMainMapper.java | 2 + .../pojo/dto/OptionalEbomSubmitEditDTO.java | 10 ++++- .../service/BomNewEbomParentService.java | 21 ++++------ .../bomnew/service/MaterialMainService.java | 9 ++++ .../OptionalEbomImportChildService.java | 41 +++++++++++++++---- .../service/aggreg/OptionalExcelService.java | 31 +------------- .../mapper/master/BomNewMbomParentMapper.xml | 1 + .../mapper/master/MaterialMainMapper.xml | 15 +++++++ 9 files changed, 99 insertions(+), 55 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java index a644e458..980786d5 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java @@ -148,6 +148,21 @@ public class OptionalEbomApi extends BaseApi { } + + + + @PutMapping("updateOptionRemark") + @ApiOperation("更改选项备注") + public ResultVO updateOptionRemark(@RequestBody OptionalEbomSubmitEditDTO.OptionalEbomImportChildSubmitDTO input) { + if(input.getRowId()==null ){ + return ResultVO.error(STATE.ParamErr, "操作数据为空"); + } + optionalEbomImportChildService.updateRemark(input); + return ResultVO.success(true); + } + + + @PutMapping("updateOptionStatus") @ApiOperation("更改选项状态") public ResultVO updateOptionStatus(@RequestBody OptionalEbomUpdateDTO input) { @@ -201,13 +216,14 @@ public class OptionalEbomApi extends BaseApi { } if(Objects.equals(dto.getPartType() , OptionalBomConstant.PartTypeEnum.PART_TYPE_CHECBOX.getValue())){ dto.setParentRowId(null); - OptionalEbomConfigEntity entity= optionalEbomConfigService.getById(dto.getRootRowId()); - if(entity!=null){ - dto.setRootRowId(entity.getParentRowId()); - } } + OptionalEbomConfigEntity entity= optionalEbomConfigService.getById(dto.getRootRowId()); + if(entity!=null){ + dto.setRootRowId(entity.getParentRowId()); + } + try { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/MaterialMainMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/MaterialMainMapper.java index 6ad30817..cde52d0a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/MaterialMainMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/MaterialMainMapper.java @@ -35,6 +35,8 @@ public interface MaterialMainMapper extends BaseMapper { List getMaterialByAnyNo(@Param("drawingNos") List drawingNos); + List initMaterialForMaterialNo(@Param("materialNo") List drawingNos); + List getUserPost(@Param("userRowId") Long userRowId); Integer getUserMultiplantFacRoleCount(@Param("userRowId") Long userRowId); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/OptionalEbomSubmitEditDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/OptionalEbomSubmitEditDTO.java index 1cb64d6d..a15d9b36 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/OptionalEbomSubmitEditDTO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/OptionalEbomSubmitEditDTO.java @@ -13,7 +13,7 @@ import java.util.List; public class OptionalEbomSubmitEditDTO { @ApiModelProperty(value = "设备数据") - private OptionalEbomMainSubmitDTO deviceInfo; + private OptionalEbomMarkSubmitDTO deviceInfo; @ApiModelProperty(value = "标配数据") private List options; @@ -23,15 +23,21 @@ public class OptionalEbomSubmitEditDTO { private Long rowId; @ApiModelProperty(value = "是否标配(0 否 1是)") private Integer chooseStatus; + @ApiModelProperty(value = "备注") + private String remak; + } @Data - public static class OptionalEbomMainSubmitDTO{ + public static class OptionalEbomMarkSubmitDTO{ @ApiModelProperty(value = "主键") private Long rowId; @ApiModelProperty(value = "备注") private String remark; } + + + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 1438e820..dd05195c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -1398,7 +1398,7 @@ public class BomNewEbomParentService extends ServiceImpl checkBom = new ArrayList<>(); + List childList=getChild(dto.getParent().getBomRowId()); @@ -1444,15 +1444,6 @@ public class BomNewEbomParentService extends ServiceImpl returnList=new ArrayList<>(); @@ -1470,8 +1461,8 @@ public class BomNewEbomParentService extends ServiceImpl checkBom = new ArrayList<>(); + checkBom.addAll(union); + checkBom.addAll(union2); + checkBom.addAll(tmp2); + checkBom.add(dto.getParent()); + checkBomException(checkBom, Arrays.asList(EBomExceptionStatusEnum.EXCEPT_NO_14.getValue())); return returnList; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java index 8953e542..abb64792 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialMainService.java @@ -224,7 +224,16 @@ public class MaterialMainService extends ServiceImpl initMaterialForMaterialNo(List materialNo) { + if (CollUtil.isNotEmpty(materialNo)) { + List materialList = SpringUtil.getBean(MaterialMainMapper.class).initMaterialForMaterialNo(materialNo); + return materialList; + + } + return null; + + } public List getExceptStatList(List materialNos,List states) { if (CollUtil.isNotEmpty(materialNos)) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java index ab06e2c7..5ab0a0f8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java @@ -17,9 +17,11 @@ import com.nflg.product.bomnew.mapper.master.OptionalEbomImportChildMapper; import com.nflg.product.bomnew.pojo.dto.OptionalEbomImportChildAddDTO; import com.nflg.product.bomnew.pojo.dto.OptionalEbomImportChildDTO; import com.nflg.product.bomnew.pojo.dto.OptionalEbomMainDelDTO; +import com.nflg.product.bomnew.pojo.dto.OptionalEbomSubmitEditDTO; import com.nflg.product.bomnew.pojo.entity.OptionalEbomConfigREntity; import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportChildEntity; import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportEntity; +import com.nflg.product.bomnew.pojo.entity.OptionalEbomMainEntity; import com.nflg.product.bomnew.pojo.query.OptionalEbomImportChildQuery; import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO; import com.nflg.product.bomnew.pojo.vo.OptionalEbomConfigRVO; @@ -70,6 +72,13 @@ public class OptionalEbomImportChildService extends ServiceImpl optionList = null; @@ -81,15 +90,22 @@ public class OptionalEbomImportChildService extends ServiceImpl listNo = Arrays.stream(array).collect(Collectors.toList()); - List materialListVo = SpringUtil.getBean(MaterialMainService.class).initMaterialForAnyNo(listNo); + .replace(",",";"); + strMaterial=strMaterial.replace("\n","").trim(); + + + + + + List listNo = StrUtil.splitTrim(strMaterial,";"); + List materialListVo = SpringUtil.getBean(MaterialMainService.class).initMaterialForMaterialNo(listNo); if (CollectionUtil.isEmpty(materialListVo)) { - throw new NflgBusinessException(STATE.BusinessError, "未查询到图号/物料相关数据"); + throw new NflgBusinessException(STATE.BusinessError, "未查询到物料相关数据"); } optionList = Convert.convert(new TypeReference>() { }, materialListVo); @@ -133,7 +149,7 @@ public class OptionalEbomImportChildService extends ServiceImpl list){ // List entityLists= Convert.toList(OptionalEbomImportChildEntity.class,list); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java index 4808df30..157fae6d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java @@ -373,7 +373,7 @@ public class OptionalExcelService { } - @Transactional(rollbackFor = Exception.class) + // @Transactional(rollbackFor = Exception.class) public Boolean batchExcelToRepertory(OptionalEbomImportExcelDTO ebomImportExcelDTO) { OptionalEbomMainEntity optionalEbomMainEntity = Convert.convert(new TypeReference() { @@ -481,35 +481,6 @@ public class OptionalExcelService { optionalEbomImportChildService.insertOptionAction(item); -// QueryWrapper queryWrapper3 = new QueryWrapper<>(); -// // 同一个机型下不可以存在相同的物料信息（物料编号），如果是“无”的情况，需同一个机型+同一个选项来做唯一判断 -// if (StrUtil.isEmpty(item.getMaterialNo()) && item.getMaterialName().equals("无")) { -// -// queryWrapper3.lambda().eq(OptionalEbomImportChildEntity::getRootRowId, optionalEbomMainEntity.getRowId()); -// queryWrapper3.lambda().eq(OptionalEbomImportChildEntity::getParentRowId, childOptionEntity.getParentRowId()); -// queryWrapper3.lambda().eq(OptionalEbomImportChildEntity::getIsDel, 0); -// -// } else { -// queryWrapper3.lambda().eq(OptionalEbomImportChildEntity::getRootRowId, optionalEbomMainEntity.getRowId()); -// queryWrapper3.lambda().eq(OptionalEbomImportChildEntity::getMaterialNo, item.getMaterialNo()); -// queryWrapper3.lambda().eq(OptionalEbomImportChildEntity::getIsDel, 0); -// } -// -// -// OptionalEbomImportChildEntity childEntity = optionalEbomImportChildService.getOne(queryWrapper3); -// if (childEntity == null) { -// item.setParentRowId(childOptionEntity.getRowId()); -// item.setRootRowId(optionalEbomMainEntity.getRowId()); -// item.setCreatedBy(SessionUtil.getUserCode()); -// // item.setCreatedTime(new Date()); -// // item.setUpdatedTime(new Date()); -// optionalEbomImportChildService.save(item); -// } else { -// item.setRowId(childEntity.getRowId()); -// optionalEbomImportChildService.updateById(item); -// -// } - } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml index 0e1ecd1f..df6bfbc1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml @@ -158,6 +158,7 @@ GROUP BY t1.bom_row_id + + + + + + +