From 915c983e0e560512935221395893e20ddc42ec23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Sun, 17 Dec 2023 15:23:25 +0800 Subject: [PATCH] =?UTF-8?q?1.ebom-=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/api/user/EbomApi.java | 21 +- .../product/bomnew/constant/EBomConstant.java | 13 + .../bomnew/constant/EBomStatusEnum.java | 6 +- .../bomnew/constant/OriginalStatusEnum.java | 2 + .../product/bomnew/constant/UserJobEnum.java | 19 ++ .../mapper/master/BomNewEbomChildMapper.java | 5 + .../master/BomNewEbomMaterialUseMapper.java | 14 + .../mapper/master/BomNewEbomParentMapper.java | 17 +- .../mapper/master/MaterialMainMapper.java | 2 + .../entity/BomNewEbomMaterialUseEntity.java | 48 ++++ .../pojo/query/BomNewEbomParentQuery.java | 3 +- .../bomnew/pojo/vo/BaseMaterialVO.java | 3 + .../service/BomNewEbomMaterialUseService.java | 19 ++ .../service/BomNewEbomParentService.java | 131 +++++++++- .../bomnew/service/UserRoleService.java | 54 ++++ .../OriginalBom/OriginalBomToEBomConvert.java | 13 +- .../mapper/master/BomNewEbomChildMapper.xml | 11 + .../master/BomNewEbomMaterialUseMapper.xml | 17 ++ .../mapper/master/BomNewEbomParentMapper.xml | 244 +++++++++++------- .../mapper/master/MaterialMainMapper.xml | 12 +- 20 files changed, 529 insertions(+), 125 deletions(-) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/UserJobEnum.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomMaterialUseMapper.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomMaterialUseEntity.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomMaterialUseService.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/UserRoleService.java create mode 100644 nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomMaterialUseMapper.xml diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java index 02c44510..d8cd68b8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java @@ -21,6 +21,7 @@ import com.nflg.product.bomnew.service.MaterialMainService; import com.nflg.product.bomnew.service.domain.EBom.VirtualPackageBase; import com.nflg.product.bomnew.service.domain.EBom.VirtualPackageFor31; import com.nflg.product.bomnew.util.EecExcelUtil; +import com.nflg.product.bomnew.util.TreeNode; import com.nflg.product.bomnew.util.VUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -61,10 +62,22 @@ public class EbomApi extends BaseApi { private MaterialMainService materialMainService; - @PostMapping("bomPage") - @ApiOperation("Ebom-列表") - public ResultVO> bomPage(@RequestBody BomNewEbomParentQuery query) { - return ResultVO.success(bomNewEbomParentService.getListPage(query)); + @PostMapping("workDetailsListByPage") + @ApiOperation("Ebom-工作明细列表") + public ResultVO>> workDetailsListByPage(@RequestBody BomNewEbomParentQuery query) { + return ResultVO.success(bomNewEbomParentService.workDetailsListByPage(query)); + } + + @PostMapping("formalWorksheet") + @ApiOperation("Ebom-正式工作表") + public ResultVO> formalWorksheet(@RequestBody BomNewEbomParentQuery query) { + return ResultVO.success(bomNewEbomParentService.formalWorksheet(query)); + } + + @PostMapping("changeImpact") + @ApiOperation("Ebom-变更影响") + public ResultVO> changeImpact(@RequestBody BomNewEbomParentQuery query) { + return ResultVO.success(bomNewEbomParentService.formalWorksheet(query)); } @GetMapping("getChild") diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java new file mode 100644 index 00000000..82040572 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomConstant.java @@ -0,0 +1,13 @@ +package com.nflg.product.bomnew.constant; + +/** + * @author 大米 + * @date 2023/11/11 20:09 + */ +public class EBomConstant { + + //设计人员 + public static final String DESIGNER = "设计人员"; + //工艺人员 + public static final String TECHNICIAN = "工艺人员"; +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomStatusEnum.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomStatusEnum.java index fdba2413..da0e0c6e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomStatusEnum.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomStatusEnum.java @@ -11,7 +11,11 @@ public enum EBomStatusEnum implements ValueEnum { WAIT_CHECK(1,"待复核"), CHECKED(2,"已复核"), RETURNED(3,"已退回"), - PUBLISHED(4,"定版（已发布PBOM）"); + PUBLISHED(4,"定版（已发布PBOM）"), + BORROWED_PARTS(99, "借用件"), + + //非自己创建的 + REFERENCE(100, "引用件"); private final Integer value; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OriginalStatusEnum.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OriginalStatusEnum.java index a6742b2a..3d193dac 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OriginalStatusEnum.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OriginalStatusEnum.java @@ -14,8 +14,10 @@ public enum OriginalStatusEnum implements ValueEnum { OVER_CONVERT(2, "已转换"), + //已发布的 BORROWED_PARTS(3, "借用件"), + //非自己创建的 REFERENCE(4, "引用件"); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/UserJobEnum.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/UserJobEnum.java new file mode 100644 index 00000000..9cad24ef --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/UserJobEnum.java @@ -0,0 +1,19 @@ +package com.nflg.product.bomnew.constant; + + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum UserJobEnum implements ValueEnum { + + // 0-设计人员 1-工艺人员 2-其他 + DESIGNER(0 ,"设计人员"), + ENGINEER(1,"工艺人员"), + OTHER(2,"其他"); + + private final Integer value; + + private final String description; +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildMapper.java index 75f78c2d..e583d490 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildMapper.java @@ -16,4 +16,9 @@ import java.util.List; public interface BomNewEbomChildMapper extends BaseMapper { List getChildByMaterialNo(@Param("materialNo") String materialNo); + + /** + * 全量更新-EBOM物料use + */ + void updateEBomMaterialUse(); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomMaterialUseMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomMaterialUseMapper.java new file mode 100644 index 00000000..bda6df5a --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomMaterialUseMapper.java @@ -0,0 +1,14 @@ +package com.nflg.product.bomnew.mapper.master; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.product.bomnew.pojo.entity.BomNewEbomMaterialUseEntity; + +/** + * t_bom_new_ebom_material_use 表数据库访问层 + * + * + * @author makejava + * @since 2023-12-17 11:27:05 + */ +public interface BomNewEbomMaterialUseMapper extends BaseMapper { +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java index 18442a1b..8e70d701 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java @@ -11,6 +11,7 @@ import com.nflg.product.bomnew.pojo.vo.MaterialHistoryProjectTypeVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Set; /** * t_bom_new_ebom_parent 表数据库访问层 @@ -27,8 +28,16 @@ public interface BomNewEbomParentMapper extends BaseMapper getEBomListPage(Page page, @Param("query") BomNewEbomParentQuery query); + Page getEBomListPage(Page page, @Param("query") BomNewEbomParentQuery query ,@Param("job") Integer job, @Param("createdBy") String createdBy); + + /** + * 正式工作表 + * @param page + * @param query + * @return + */ + Page formalWorksheet(Page page, @Param("query") BomNewEbomParentQuery query); /** * 获取子级 * @param rowId @@ -39,4 +48,10 @@ public interface BomNewEbomParentMapper extends BaseMapper getParentChildBatch(@Param("rowIds") List rowIds); MaterialHistoryProjectTypeVO getMaterialHistoryProjectType(@Param("materialNo")String materialNo); + + Set getSelfParentMaterialNo(@Param("createdBy") String createdBy ,@Param("list") Set list); + + List getParentForMaterialNoSeach(@Param("materialNoList") List materialNoList); + + List getChildForMaterialNoSeach(@Param("materialNoList") List materialNoList); } 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 6eea165a..64de7536 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 @@ -33,6 +33,8 @@ public interface MaterialMainMapper extends BaseMapper { List getMaterialByAnyNo(@Param("drawingNos") List drawingNos); + List getUserPost(@Param("userRowId") Long userRowId); + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomMaterialUseEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomMaterialUseEntity.java new file mode 100644 index 00000000..6ff9add9 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomMaterialUseEntity.java @@ -0,0 +1,48 @@ +package com.nflg.product.bomnew.pojo.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import lombok.Data; +import lombok.experimental.Accessors; +import java.time.LocalDateTime; +import java.time.LocalDate; + +/** + * t_bom_new_ebom_material_use + * + * + * @author makejava + * @since 2023-12-17 11:27:05 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="com-nflg-product-bomnew-pojo-new-entity-BomNewEbomMaterialUseEntity") +@TableName(value = "t_bom_new_ebom_material_use") +public class BomNewEbomMaterialUseEntity implements Serializable { + + /** + * 主键-雪花 + */ + @TableId(value = "row_id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键-雪花") + private Long rowId; + + /** + * 物料编码 + */ + @TableField(value = "material_no") + @ApiModelProperty(value = "物料编码") + private String materialNo; + + /** + * 父级物料编码，多个用逗号隔开 + */ + @TableField(value = "parent_material_no") + @ApiModelProperty(value = "父级物料编码，多个用逗号隔开") + private String parentMaterialNo; + + private static final long serialVersionUID = 344881455840528407L; + +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java index 34fb8c26..5aaa042f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java @@ -47,9 +47,10 @@ public class BomNewEbomParentQuery extends BasePageQuery implements Serializabl @ApiModelProperty(value = "结束时间") private String endDate; - @ApiModelProperty("数据类型 0-EBOM工作列表数据 1-EBOM的变更页面数据 ") + @ApiModelProperty("数据类型 0-EBOM工作列表数据 1-EBOM正式工作表明细 2-变更影响") private Integer dataType=0; + diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java index 6c6f3079..dc6eb24e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java @@ -52,4 +52,7 @@ public class BaseMaterialVO { @ApiModelProperty("材质") private String materialTexture; + + @ApiModelProperty("物料大类别") + private String relCategoryCode; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomMaterialUseService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomMaterialUseService.java new file mode 100644 index 00000000..a1749528 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomMaterialUseService.java @@ -0,0 +1,19 @@ +package com.nflg.product.bomnew.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.product.bomnew.mapper.master.BomNewEbomMaterialUseMapper; +import com.nflg.product.bomnew.pojo.entity.BomNewEbomMaterialUseEntity; +import org.springframework.stereotype.Service; + + +/** + * t_bom_new_ebom_material_use 表服务实现类 + * + * + * @author makejava + * @since 2023-12-17 11:27:05 + */ +@Service +public class BomNewEbomMaterialUseService extends ServiceImpl { + +} 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 7513fa03..32154d32 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 @@ -18,9 +18,7 @@ import com.nflg.product.bomnew.constant.*; import com.nflg.product.bomnew.mapper.master.BomNewEbomParentMapper; import com.nflg.product.bomnew.pojo.dto.BomNewEBomCreateDTO; import com.nflg.product.bomnew.pojo.dto.VirtualPackageParamDto; -import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity; -import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity; -import com.nflg.product.bomnew.pojo.entity.BomNewOriginalParentEntity; +import com.nflg.product.bomnew.pojo.entity.*; import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery; import com.nflg.product.bomnew.pojo.query.OriginalBomQuery; import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO; @@ -32,10 +30,7 @@ import com.nflg.product.bomnew.service.domain.EBom.EbomInitProjectType; import com.nflg.product.bomnew.service.domain.EBom.VirtualPackageBase; import com.nflg.product.bomnew.service.domain.EBom.VirtualPackageFor31; import com.nflg.product.bomnew.service.domain.OriginalBom.OriginalBomDetailTask; -import com.nflg.product.bomnew.util.EecExcelUtil; -import com.nflg.product.bomnew.util.ListCommonUtil; -import com.nflg.product.bomnew.util.MaterialshouldBomExistUtil; -import com.nflg.product.bomnew.util.VUtils; +import com.nflg.product.bomnew.util.*; import nflg.product.common.constant.STATE; import nflg.product.common.vo.ResultVO; import org.apache.ibatis.annotations.Param; @@ -77,20 +72,133 @@ public class BomNewEbomParentService extends ServiceImpl getListPage(BomNewEbomParentQuery query) { - Page result = this.getBaseMapper().getEBomListPage(new Page<>(query.getPage(), query.getPageSize()), query); + public Page> workDetailsListByPage(BomNewEbomParentQuery query) { + + Page> returnResult = new Page<>(); + //物料编码搜索或图号搜索 + if(StrUtil.isNotBlank(query.getMaterialNo()) || StrUtil.isNotBlank(query.getDrawingNo())) { + String materialNo=query.getMaterialNo(); + if(StrUtil.isBlank(materialNo)){ + List materialList = materialMainService.lambdaQuery().eq(MaterialMainEntity::getDrawingNo, query.getDrawingNo()).list(); + if(CollUtil.isNotEmpty(materialList)){ + materialNo=materialList.get(0).getMaterialNo(); + } + } + if(StrUtil.isNotBlank(materialNo)){ + List parentMaterialByMaterialNo = getParentMaterialByMaterialNo(materialNo, !userRoleService.technician()); + List parents = this.getBaseMapper().getParentForMaterialNoSeach(parentMaterialByMaterialNo); + List childs = this.getBaseMapper().getChildForMaterialNoSeach(parentMaterialByMaterialNo); + + returnResult= handSeachToTree(parents,childs); + } + }else { + Page result = this.getBaseMapper().getEBomListPage(new Page<>(query.getPage(), query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode()); + + materialMainService.intiMaterialInfo(result.getRecords()); + Page> resutlData = new Page<>(); + BeanUtil.copyProperties(result, resutlData); + resutlData.setRecords(handNodeToTree(result.getRecords())); + returnResult= resutlData; + } + return returnResult; + } + private Page> handSeachToTree(List parents, List childs){ + Page> resutlData = new Page<>(); + Set parentSet = parents.stream().map(u -> u.getMaterialNo()).collect(Collectors.toSet()); + Set childSet = childs.stream().map(u -> u.getMaterialNo()).collect(Collectors.toSet()); + Set difference = Sets.difference(parentSet, childSet); + List resultParents = parents.stream().filter(u -> difference.contains(u.getMaterialNo())).collect(Collectors.toList()); + resutlData.setTotal(difference.size()); + resutlData.setSize(difference.size()); + resutlData.setPages(1); + resutlData.setCurrent(1L); + List all=new ArrayList<>(); + all.addAll(parents); + all.addAll(childs); + List> result=new ArrayList<>(); + for (BomNewEbomParentVO vo : resultParents) { + result.addAll( TreeUtils.toTree(vo.getRowId(), all, BomNewEbomParentVO::getParentRowId, BomNewEbomParentVO::getBomRowId)); + } + resutlData.setRecords(result); + return resutlData; + } + + private List> handNodeToTree(List list){ + List> result=new ArrayList<>(); + for (BomNewEbomParentVO vo : list) { + TreeNode treeData= new TreeNode<>(); + treeData.setData(vo); + result.add(treeData); + } + return result; + } + + + /** + * 获取物料所有父节点 + * @param materialNo + * @return + */ + private List getParentMaterialByMaterialNo(String materialNo , Boolean selfIs) { + BomNewEbomMaterialUseEntity materialBom = bomNewEbomMaterialUseService.lambdaQuery().eq(BomNewEbomMaterialUseEntity::getMaterialNo, materialNo).one(); + List result = new ArrayList<>(); + if (Objects.nonNull(materialBom) && StrUtil.isNotBlank(materialBom.getParentMaterialNo())) { + Set relSkuNo = Sets.newHashSet(StrUtil.split(materialBom.getParentMaterialNo(), ",")); + if(selfIs && CollUtil.isNotEmpty(relSkuNo)){ + relSkuNo=getSelfMaterialNo(relSkuNo); + } + while (CollUtil.isNotEmpty(relSkuNo)) { + result.addAll(relSkuNo); + List relSkuList = bomNewEbomMaterialUseService.lambdaQuery().in(BomNewEbomMaterialUseEntity::getMaterialNo, relSkuNo).list(); + relSkuNo.clear(); + Set finalRelSkuNo = relSkuNo; + relSkuList.forEach(k -> { + if (StrUtil.isNotBlank(k.getParentMaterialNo())) { + finalRelSkuNo.addAll(Sets.newHashSet(StrUtil.split(k.getParentMaterialNo(), ",")) ); + } + }); + relSkuNo=finalRelSkuNo; + if(CollUtil.isNotEmpty(relSkuNo) && selfIs){ + relSkuNo=getSelfMaterialNo(relSkuNo); + } + } + } + return result; + } + + private Set getSelfMaterialNo(Set relSkuNo){ + Set selfParentMaterialNo = this.getBaseMapper().getSelfParentMaterialNo(SessionUtil.getUserCode(), relSkuNo); + return selfParentMaterialNo; + } + + + /** + * 正式工作表 + * @param query + * @return + */ + public Page formalWorksheet(BomNewEbomParentQuery query) { + Page result = this.getBaseMapper().formalWorksheet(new Page<>(query.getPage(), query.getPageSize()), query); materialMainService.intiMaterialInfo(result.getRecords()); return result; } + + /** * 获取子级 * @@ -113,12 +221,15 @@ public class BomNewEbomParentService extends ServiceImpl getUserPost(){ + + return materialMainService.getBaseMapper().getUserPost(SessionUtil.getRowId()); + } + + /** + * 是否设计人员 + * @return + */ + public Boolean designer(){ + return getUserPost().contains(EBomConstant.DESIGNER); + } + + /** + * 是否工艺 + * @return + */ + public Boolean technician(){ + return getUserPost().contains(EBomConstant.TECHNICIAN); + } + + /** + * 获取用户岗位 + * @return + */ + public Integer getUserJob(){ + return 1; +// return technician()? UserJobEnum.ENGINEER.getValue():UserJobEnum.DESIGNER.getValue(); + } +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java index 33fbb369..89aa5cce 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java @@ -10,10 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.nflg.product.base.core.conmon.util.SessionUtil; -import com.nflg.product.bomnew.constant.EBomSourceEnum; -import com.nflg.product.bomnew.constant.OriginalConstant; -import com.nflg.product.bomnew.constant.OriginalSourceEnum; -import com.nflg.product.bomnew.constant.OriginalStatusEnum; +import com.nflg.product.bomnew.constant.*; import com.nflg.product.bomnew.mapper.master.BomNewEbomChildMapper; import com.nflg.product.bomnew.mapper.master.MaterialMainMapper; import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity; @@ -25,6 +22,7 @@ import com.nflg.product.bomnew.pojo.vo.BomOriginalPlmBomVO; import com.nflg.product.bomnew.pojo.vo.MaterialMateVO; import com.nflg.product.bomnew.service.BomNewEbomParentService; import com.nflg.product.bomnew.service.MaterialMainService; +import com.nflg.product.bomnew.service.UserRoleService; import com.nflg.product.bomnew.util.ListCommonUtil; import com.nflg.product.bomnew.util.VUtils; import com.nflg.product.bomnew.util.VersionUtil; @@ -92,7 +90,7 @@ public class OriginalBomToEBomConvert extends BaseConvert { } //子节点 List parentChild = bomDetail.stream().filter(u -> Objects.nonNull(u.getParentRowId()) && u.getParentRowId().equals(parentEnt.getBomRowId())).collect(Collectors.toList()); - //List parentChildNoMaterilaNoList = parentChild.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList()); + List parentChildNoMaterilaNoList = parentChild.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList()); //无编码 if (StrUtil.isBlank(parentEnt.getMaterialNo())) { @@ -101,7 +99,7 @@ public class OriginalBomToEBomConvert extends BaseConvert { if(StrUtil.isNotBlank(parentEnt.getDrawingNo())) { SpringUtil.getBean(MaterialMainService.class).initMaterialForDrawdingNo(ImmutableList.of(parentEnt), BomOriginalListVO::getDrawingNo, BomOriginalListVO::setMaterialNo, BomOriginalListVO::setMaterialName); //子级初始化物料编码 - // SpringUtil.getBean(MaterialMainService.class).initMaterialForDrawdingNo(parentChildNoMaterilaNoList, BomOriginalListVO::getDrawingNo, BomOriginalListVO::setMaterialNo, BomOriginalListVO::setMaterialName); + SpringUtil.getBean(MaterialMainService.class).initMaterialForDrawdingNo(parentChildNoMaterilaNoList, BomOriginalListVO::getDrawingNo, BomOriginalListVO::setMaterialNo, BomOriginalListVO::setMaterialName); } //合并相同编码的物料 List mergeResult = mergeBOM(parentChild); @@ -233,6 +231,9 @@ public class OriginalBomToEBomConvert extends BaseConvert { eBomParent.setLastVersionIs(1); eBomParent.setModifyTime(LocalDateTime.now()); eBomParent.setBomExist(parentEnt.getBomRowId()>0?1:0); + //工艺岗直接到已复核 + eBomParent.setStatus(SpringUtil.getBean(UserRoleService.class).technician()? EBomStatusEnum.CHECKED.getValue():EBomStatusEnum.WAIT_CHECK.getValue()); + eBomParent.setCreatedJob(SpringUtil.getBean(UserRoleService.class).technician()?UserJobEnum.ENGINEER.getValue():UserJobEnum.DESIGNER.getValue()); if (Objects.nonNull(ebom)) { ebom.setLastVersionIs(0); this.eBomParentResult.add(ebom); diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml index 1cb1bf34..1ba9b004 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml @@ -47,4 +47,15 @@ join t_bom_new_ebom_child b on a.row_id = b.parent_row_id and a.material_no = #{materialNo} and a.last_version_is = 1 + + + SET @@global.group_concat_max_len=804800; + delete from t_bom_new_ebom_material_use; + INSERT INTO `t_bom_new_ebom_material_use` (`row_id`, `material_no`, `parent_material_no`) + + select min(b.row_id) rowId, b.material_no, GROUP_CONCAt( distinct a.material_no) as value_list + from t_bom_new_ebom_parent a + join t_bom_new_ebom_child b on a.row_id=b.parent_row_id and a.last_version_is=1 + group by b.material_no ; + diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomMaterialUseMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomMaterialUseMapper.xml new file mode 100644 index 00000000..db8d0c9b --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomMaterialUseMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + row_id, material_no, parent_material_no + + diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index 5d3e67af..08f68070 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -1,112 +1,158 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - row_id, batch_no, drawing_no, material_no, order_number, material_name, material_desc, material_texture, material_unit, unit_weight, total_weight, current_version, num, source, project_type, project_type_input_type, root_is,virtrual_package_enum, should_bom_exist, super_material_status, bom_exist, last_version_is, edit_status, status, user_root_is, exception_status,virtual_package_is, source_row_id, devise_user_code, devise_name, created_by, created_time, created_job, audit_time, audit_user_name, release_time, release_user_name, revert_time, revert_user_name, expire_end_time, convert_to_ebom_time, remark, dept_name, level_num, change_desc, notice_nums, modify_time + row_id, batch_no, drawing_no, material_no, order_number, material_name, material_desc, material_texture, + material_unit, unit_weight, total_weight, current_version, num, source, project_type, project_type_input_type, + root_is,virtrual_package_enum, should_bom_exist, super_material_status, bom_exist, last_version_is, edit_status, + status, user_root_is, exception_status,virtual_package_is, source_row_id, devise_user_code, devise_name, + created_by, created_time, created_job, audit_time, audit_user_name, release_time, release_user_name, + revert_time, revert_user_name, expire_end_time, convert_to_ebom_time, remark, dept_name, level_num, change_desc, + notice_nums, modify_time + - - - and drawing_no=#{query.drawingNo} - - - and material_no=#{query.materialNo} - - - and devise_name=#{query.deviseName} - - - and created_time between #{query.startDate} and #{query.endDate} - - - and status=1 or status=3 - - - and status=2 or status=4 - - + + + and drawing_no=#{query.drawingNo} + + + and material_no=#{query.materialNo} + + + and devise_name=#{query.deviseName} + + + and created_time between #{query.startDate} and #{query.endDate} + + - + + - - - - - - + + + + + + + + + + + + + + + + diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml index 09325a1e..ab14af09 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml @@ -70,9 +70,9 @@ + + +