rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

原始BOM列表

This commit is contained in:
大米 2023-12-01 12:25:24 +08:00
parent f95a3de394
commit e0e0f49dcc
24 changed files with 257 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
View File

@ -1,8 +1,13 @@
package com.nflg.product.bomnew.api.user;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nflg.product.base.core.api.BaseApi;
import com.nflg.product.bomnew.pojo.query.OriginalBomQuery;
import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO;
import com.nflg.product.bomnew.service.BomNewEbomParentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import nflg.product.common.vo.ResultVO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -27,5 +32,11 @@ public class EbomApi extends BaseApi {
private BomNewEbomParentService bomNewEbomParentService;
@PostMapping("bomPage")
@ApiOperation("Ebom-列表")
public ResultVO<Page<BomOriginalListVO>> bomPage(@RequestBody OriginalBomQuery query) {
return ResultVO.success(null);
}
}

18
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nflg.product.base.core.api.BaseApi;
import com.nflg.product.base.core.conmon.util.SessionUtil;
import com.nflg.product.bomnew.pojo.dto.OriginalSaveBomDTO;
import com.nflg.product.bomnew.pojo.query.OriginalBomFromPlmQuery;
import com.nflg.product.bomnew.pojo.query.OriginalBomQuery;
import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO;
import com.nflg.product.bomnew.service.BomNewOriginalParentService;
@ -13,16 +12,14 @@ import com.nflg.product.bomnew.util.TreeNode;
import com.nflg.product.bomnew.util.VUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.Getter;
import nflg.product.common.constant.STATE;
import nflg.product.common.vo.ResultVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
/**
@ -109,5 +106,16 @@ public class OriginalBomApi extends BaseApi {
}
@ApiOperation("导入")
@PostMapping("importBom")
@Transactional(rollbackFor = Exception.class)
public ResultVO<Boolean> importBom(@RequestParam(value = "file")MultipartFile file){
if (file != null && !file.getOriginalFilename().endsWith("xls") && !file.getOriginalFilename().endsWith("xlsx")) {
return ResultVO.error("请上传Excel文件");
}
return ResultVO.success(true);
}
}

5
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OriginalStatusEnum.java
View File

@ -14,7 +14,10 @@ public enum OriginalStatusEnum implements ValueEnum<Integer> {
OVER_CONVERT(2, "已转换"),
BORROWED_PARTS(3, "借用件");
BORROWED_PARTS(3, "借用件"),
REFERENCE(4, "引用件");
private final Integer value;

15
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomOriginalCadChildMapper.java Normal file
View File

@ -0,0 +1,15 @@
package com.nflg.product.bomnew.mapper.master;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nflg.product.bomnew.pojo.entity.BomOriginalCadChildEntity;
/**
* t_bom_original_cad_child 表数据库访问层
* 原始BOM临时表（字表）
*
* @author makejava
* @since 2023-11-28 19:39:47
*/
public interface BomOriginalCadChildMapper extends BaseMapper<BomOriginalCadChildEntity> {
}

21
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomOriginalCadParentMapper.java Normal file
View File

@ -0,0 +1,21 @@
package com.nflg.product.bomnew.mapper.master;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nflg.product.bomnew.pojo.entity.BomOriginalCadParentEntity;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* t_bom_original_cad_parent 表数据库访问层
* 原始BOM临时表（父表）
*
* @author makejava
* @since 2023-11-28 19:39:45
*/
public interface BomOriginalCadParentMapper extends BaseMapper<BomOriginalCadParentEntity> {
void clearPlmBom(@Param("id") Integer id);
void delChildByParentRowIds(@Param("rowIds") List<Integer> rowIds);
}

14
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomOriginalPlmChildMapper.java
View File

@ -1,14 +0,0 @@
package com.nflg.product.bomnew.mapper.master;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nflg.product.bomnew.pojo.entity.BomOriginalPlmChildEntity;
/**
* t_bom_original_plm_child 表数据库访问层
* 原始BOM临时表（字表）
*
* @author makejava
* @since 2023-11-09 14:13:38
*/
public interface BomOriginalPlmChildMapper extends BaseMapper<BomOriginalPlmChildEntity> {
}

23
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomOriginalPlmParentMapper.java
View File

@ -1,23 +0,0 @@
package com.nflg.product.bomnew.mapper.master;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nflg.product.bomnew.pojo.entity.BomOriginalPlmParentEntity;
import io.swagger.v3.oas.models.security.SecurityScheme;
import lombok.AllArgsConstructor;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* t_bom_original_plm_parent 表数据库访问层
* 原始BOM临时表（父表）
*
* @author makejava
* @since 2023-11-09 14:17:10
*/
public interface BomOriginalPlmParentMapper extends BaseMapper<BomOriginalPlmParentEntity> {
void clearPlmBom(@Param("id") Integer id);
void delChildByParentRowIds(@Param("rowIds")List<Integer> rowIds);
}

50
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java Normal file
View File

@ -0,0 +1,50 @@
package com.nflg.product.bomnew.pojo.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.ttzero.excel.annotation.ExcelColumn;
import java.math.BigDecimal;
/**
* 原始BOM-excel 导入DTO
*/
@Data
public class BomNewOriginalExcelDTO {
@ExcelColumn("层次")
private String levelNo;
@ExcelColumn("物料编码")
private String materialNo;
@ExcelColumn("图号")
private String drawingNo;
@ExcelColumn("名称")
private String materialName;
@ExcelColumn("材料")
private String materialTexture;
@ExcelColumn(value = "数量")
private BigDecimal num;
@ExcelColumn("单位")
private String unitName;
@ExcelColumn(value = "版本")
private String currentVersion;
@ExcelColumn(value = "单重")
private BigDecimal unitWeight;
@ExcelColumn(value = "备注")
private String remark;
}

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java
View File

@ -106,6 +106,10 @@ public class BomNewOriginalChildEntity implements Serializable {
@ApiModelProperty("创建人")
private String createdBy;
@TableField(value = "created_time")
@ApiModelProperty("创建时间")
private LocalDateTime createdTime;
/**
* 处理状态：1=待处理、2=已处理
*/

12
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomOriginalPlmChildEntity.java → nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomOriginalCadChildEntity.java
View File

@ -12,17 +12,17 @@ import java.time.LocalDateTime;
import java.time.LocalDate;
/**
* t_bom_original_plm_child
* t_bom_original_cad_child
* 原始BOM临时表（字表）
*
* @author makejava
* @since 2023-11-09 14:13:38
* @since 2023-11-28 19:39:47
*/
@Data
@Accessors(chain = true)
@ApiModel(value="com-nflg-product-bomnew-pojo-original-entity-BomOriginalPlmChildEntity")
@TableName(value = "t_bom_original_plm_child")
public class BomOriginalPlmChildEntity implements Serializable {
@ApiModel(value="com-nflg-product-bomnew-pojo-original-entity-BomOriginalCadChildEntity")
@TableName(value = "t_bom_original_cad_child")
public class BomOriginalCadChildEntity implements Serializable {
/**
*
@ -150,6 +150,6 @@ public class BomOriginalPlmChildEntity implements Serializable {
@ApiModelProperty(value = "修改时间（先不要删）")
private LocalDateTime updatedTime;
private static final long serialVersionUID = 847283041627567558L;
private static final long serialVersionUID = -98365131712273531L;
}

30
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomOriginalPlmParentEntity.java → nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomOriginalCadParentEntity.java
View File

@ -1,30 +1,28 @@
package com.nflg.product.bomnew.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
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_original_plm_parent
* t_bom_original_cad_parent
* 原始BOM临时表（父表）
*
* @author makejava
* @since 2023-11-09 14:12:56
* @since 2023-11-28 19:39:45
*/
@Data
@Accessors(chain = true)
@ApiModel(value="com-nflg-product-bomnew-pojo-original-entity-BomOriginalPlmParentEntity")
@TableName(value = "t_bom_original_plm_parent")
public class BomOriginalPlmParentEntity implements Serializable {
@ApiModel(value="com-nflg-product-bomnew-pojo-original-entity-BomOriginalCadParentEntity")
@TableName(value = "t_bom_original_cad_parent")
public class BomOriginalCadParentEntity implements Serializable {
/**
*
@ -145,6 +143,6 @@ public class BomOriginalPlmParentEntity implements Serializable {
@ApiModelProperty(value = "修改时间（先不要删）")
private LocalDateTime updatedTime;
private static final long serialVersionUID = -95085810690010973L;
private static final long serialVersionUID = 437197042057659348L;
}

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java
View File

@ -15,7 +15,7 @@ public class BaseMaterialVO {
@ApiModelProperty("物料主数据行ID")
private List materialRowId;
private Long materialRowId;
@ApiModelProperty("物料编码")
private String materialNo;

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalListVO.java
View File

@ -131,7 +131,7 @@ public class BomOriginalListVO extends BaseMaterialVO {
* 设计维护部门行ID
*/
@ApiModelProperty(value = "设计维护部门行ID")
private Integer deptRowId;
private Long deptRowId;
/**
* 设计维护部门名称

34
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
View File

@ -2,20 +2,18 @@ package com.nflg.product.bomnew.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.ImmutableMap;
import com.nflg.product.base.core.conmon.util.SessionUtil;
import com.nflg.product.bomnew.constant.OriginalConstant;
import com.nflg.product.bomnew.constant.OriginalEditStatusEnum;
import com.nflg.product.bomnew.constant.OriginalSourceEnum;
import com.nflg.product.bomnew.constant.OriginalStatusEnum;
import com.nflg.product.bomnew.mapper.master.BomNewOriginalParentMapper;
import com.nflg.product.bomnew.pojo.dto.OriginalSaveBomDTO;
import com.nflg.product.bomnew.pojo.entity.BomNewOriginalChildEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewOriginalParentEntity;
import com.nflg.product.bomnew.pojo.entity.BomOriginalPlmParentEntity;
import com.nflg.product.bomnew.pojo.entity.BomOriginalCadParentEntity;
import com.nflg.product.bomnew.pojo.query.OriginalBomQuery;
import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO;
import com.nflg.product.bomnew.service.domain.OriginalBom.OriginalBomDetailTask;
@ -27,8 +25,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.sql.Struct;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@ -37,7 +33,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.ForkJoinTask;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
@ -51,7 +46,7 @@ import java.util.stream.Stream;
public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParentMapper, BomNewOriginalParentEntity> {
@Resource
BomOriginalPlmParentService originalPlmParentService;
BomOriginalCadParentService originalCadParentService;
@Resource
BomNewOriginalChildService originalChildService;
@ -69,6 +64,9 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
@Resource
MaterialMainService materialMainService;
@Resource
BomNewOriginalParentService parentService;
/**
* 获取原始BOM列表
*
@ -127,7 +125,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
* @return
*/
public List<BomOriginalListVO> getChild(Long rowId) {
BomOriginalPlmParentEntity parent = originalPlmParentService.getBaseMapper().selectById(rowId);
BomNewOriginalParentEntity parent = parentService.getBaseMapper().selectById(rowId);
List<BomOriginalListVO> parentChild = this.getBaseMapper().getParentChild(rowId);
materialMainService.intiMaterialInfo(parentChild);
if (CollUtil.isNotEmpty(parentChild)) {
@ -146,13 +144,21 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
child.setCreatedTime(parentEntity.getCreatedTime());
child.setBomRowId(parentEntity.getRowId());
child.setLevelNum(parentEntity.getLevelNum());
child.setDeptName(parentEntity.getDeptName());
child.setSource(parentEntity.getSource());
//非本人则为借用件
if(child.getCreatedBy().equals(SessionUtil.getUserCode())){
if(child.getCreatedBy().equals(SessionUtil.getUserCode()) && OriginalStatusEnum.UN_CONVERT.equalsValue(parentEntity.getStatus()) ){
child.setStatus(OriginalStatusEnum.REFERENCE.getValue());
}else {
child.setStatus(OriginalStatusEnum.BORROWED_PARTS.getValue());
}
}
else { //无BOM-版本时 确定版本号
child.setStatus(OriginalStatusEnum.UN_CONVERT.getValue());
child.setSource(Objects.nonNull(parent)? parent.getSource(): OriginalSourceEnum.CAD_IMPORT.getValue());
child.setDeviseUserCode(parent.getDeviseUserCode());
child.setDeviseName(parent.getDeviseName());
child.setDeptName(parent.getDeptName());
if( MaterialshouldBomExistUtil.checkShouldBomExist(child)){
child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
child.setStatus(OriginalStatusEnum.UN_CONVERT.getValue());
@ -229,11 +235,11 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
@Transactional(rollbackFor = Exception.class)
public void pullFromPlm(String userCode) {
List<BomOriginalPlmParentEntity> parents = originalPlmParentService.lambdaQuery().eq(BomOriginalPlmParentEntity::getStatus, 1).eq(BomOriginalPlmParentEntity::getCreatedBy, userCode).list();
List<BomOriginalCadParentEntity> parents = originalCadParentService.lambdaQuery().eq(BomOriginalCadParentEntity::getStatus, 1).eq(BomOriginalCadParentEntity::getCreatedBy, userCode).list();
VUtils.isTure(CollUtil.isEmpty(parents)).throwMessage("没有你的数据，你无需转换");
PlmBomToOriginalConvert convert = new PlmBomToOriginalConvert();
for (BomOriginalPlmParentEntity parent : parents) {
for (BomOriginalCadParentEntity parent : parents) {
//转原始BOM
convert.convertOriginalBom(parent);
@ -248,8 +254,8 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
//删除plm临时表数据
List<Integer> delRowIds = parents.stream().map(u -> u.getRowId()).collect(Collectors.toList());
if(CollUtil.isNotEmpty(delRowIds)) {
originalPlmParentService.getBaseMapper().deleteBatchIds(delRowIds);
originalPlmParentService.getBaseMapper().delChildByParentRowIds(delRowIds);
originalCadParentService.getBaseMapper().deleteBatchIds(delRowIds);
originalCadParentService.getBaseMapper().delChildByParentRowIds(delRowIds);
}
}

20
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomOriginalCadChildService.java Normal file
View File

@ -0,0 +1,20 @@
package com.nflg.product.bomnew.service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.product.bomnew.mapper.master.BomOriginalCadChildMapper;
import com.nflg.product.bomnew.pojo.entity.BomOriginalCadChildEntity;
import org.springframework.stereotype.Service;
/**
* t_bom_original_cad_child 表服务实现类
* 原始BOM临时表（字表）
*
* @author makejava
* @since 2023-11-28 19:39:47
*/
@Service
public class BomOriginalCadChildService extends ServiceImpl<BomOriginalCadChildMapper, BomOriginalCadChildEntity> {
}

19
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomOriginalCadParentService.java Normal file
View File

@ -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.BomOriginalCadParentMapper;
import com.nflg.product.bomnew.pojo.entity.BomOriginalCadParentEntity;
import org.springframework.stereotype.Service;
/**
* t_bom_original_cad_parent 表服务实现类
* 原始BOM临时表（父表）
*
* @author makejava
* @since 2023-11-28 19:39:45
*/
@Service
public class BomOriginalCadParentService extends ServiceImpl<BomOriginalCadParentMapper, BomOriginalCadParentEntity> {
}

19
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomOriginalPlmChildService.java
View File

@ -1,19 +0,0 @@
package com.nflg.product.bomnew.service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.product.bomnew.mapper.master.BomOriginalPlmChildMapper;
import com.nflg.product.bomnew.pojo.entity.BomOriginalPlmChildEntity;
import org.springframework.stereotype.Service;
/**
* t_bom_original_plm_child 表服务实现类
* 原始BOM临时表（字表）
*
* @author makejava
* @since 2023-11-09 14:13:38
*/
@Service
public class BomOriginalPlmChildService extends ServiceImpl<BomOriginalPlmChildMapper, BomOriginalPlmChildEntity> {
}

20
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomOriginalPlmParentService.java
View File

@ -1,20 +0,0 @@
package com.nflg.product.bomnew.service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.product.bomnew.mapper.master.BomOriginalPlmParentMapper;
import com.nflg.product.bomnew.pojo.entity.BomOriginalPlmParentEntity;
import org.springframework.stereotype.Service;
/**
* t_bom_original_plm_parent 表服务实现类
* 原始BOM临时表（父表）
*
* @author makejava
* @since 2023-11-09 14:12:56
*/
@Service
public class BomOriginalPlmParentService extends ServiceImpl<BomOriginalPlmParentMapper, BomOriginalPlmParentEntity> {
}

13
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java
View File

@ -1,8 +1,6 @@
package com.nflg.product.bomnew.service.domain.OriginalBom;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
@ -19,10 +17,12 @@ import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO;
import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO;
import com.nflg.product.bomnew.pojo.vo.BomOriginalPlmBomVO;
import com.nflg.product.bomnew.pojo.vo.MaterialMateVO;
import com.nflg.product.bomnew.service.*;
import com.nflg.product.bomnew.service.BomNewEbomParentService;
import com.nflg.product.bomnew.service.BomNewOriginalChildService;
import com.nflg.product.bomnew.service.BomNewOriginalParentService;
import com.nflg.product.bomnew.service.BomOriginalCadParentService;
import com.nflg.product.bomnew.service.cache.MaterialMateCache;
import com.nflg.product.bomnew.util.ClassCompareUtil;
import com.nflg.product.bomnew.util.ListCommonUtil;
import com.nflg.product.bomnew.util.MaterialshouldBomExistUtil;
import com.nflg.product.bomnew.util.VersionUtil;
import lombok.Data;
@ -32,7 +32,6 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
*
@ -124,7 +123,7 @@ public abstract class BaseConvert {
parentEntity.setEditStatus(OriginalEditStatusEnum.HANDLER_CREATED.getValue());
parentEntity.setDeptRowId(SessionUtil.getPartRowId());
parentEntity.setDeptName(SessionUtil.getFullDeptName());
parentEntity.setSource(OriginalSourceEnum.PLM_PUSH.getValue());
parentEntity.setSource(OriginalSourceEnum.CAD_IMPORT.getValue());
parentEntity.setCreatedBy(material.getCreatedBy());
parentEntity.setCreatedTime(LocalDateTime.now());
@ -258,7 +257,7 @@ public abstract class BaseConvert {
* @return
*/
protected boolean clearPlmBom(BomOriginalPlmBomVO parent){
SpringUtil.getBean(BomOriginalPlmParentService.class).getBaseMapper().clearPlmBom(parent.getRowId());
SpringUtil.getBean(BomOriginalCadParentService.class).getBaseMapper().clearPlmBom(parent.getRowId());
return true;
}

8
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java
View File

@ -6,7 +6,6 @@ import cn.hutool.extra.spring.SpringUtil;
import com.github.xiaoymin.knife4j.core.util.StrUtil;
import com.google.common.collect.ImmutableList;
import com.nflg.product.bomnew.constant.EBomStatusEnum;
import com.nflg.product.bomnew.constant.MaterialGetEnum;
import com.nflg.product.bomnew.constant.OriginalConstant;
import com.nflg.product.bomnew.constant.OriginalStatusEnum;
import com.nflg.product.bomnew.mapper.master.MaterialMainMapper;
@ -14,9 +13,8 @@ import com.nflg.product.bomnew.pojo.entity.*;
import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO;
import com.nflg.product.bomnew.pojo.vo.BomOriginalPlmBomVO;
import com.nflg.product.bomnew.pojo.vo.MaterialMateVO;
import com.nflg.product.bomnew.service.BomOriginalPlmChildService;
import com.nflg.product.bomnew.service.BomOriginalCadChildService;
import com.nflg.product.bomnew.service.MaterialMainService;
import com.nflg.product.bomnew.service.cache.MaterialMateCache;
import com.nflg.product.bomnew.util.VUtils;
import java.util.ArrayList;
@ -40,8 +38,8 @@ public class PlmBomToOriginalConvert extends BaseConvert {
/**
* 转原始BOM
*/
public void convertOriginalBom(BomOriginalPlmParentEntity inParent) {
childs = Convert.toList(BomOriginalPlmBomVO.class, SpringUtil.getBean(BomOriginalPlmChildService.class).lambdaQuery().eq(BomOriginalPlmChildEntity::getParentRowId, inParent.getRowId()).list());
public void convertOriginalBom(BomOriginalCadParentEntity inParent) {
childs = Convert.toList(BomOriginalPlmBomVO.class, SpringUtil.getBean(BomOriginalCadChildService.class).lambdaQuery().eq(BomOriginalCadChildEntity::getParentRowId, inParent.getRowId()).list());
parent = Convert.convert(BomOriginalPlmBomVO.class, inParent);
//初始化物料信息
SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(parent));

3
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml
View File

@ -18,11 +18,12 @@
<result column="remark" property="remark" jdbcType="VARCHAR"/>
<result column="created_by" property="createdBy" jdbcType="VARCHAR"/>
<result column="edit_status" property="editStatus" jdbcType="INTEGER"/>
<result column="created_time" property="createdTime" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
row_id, parent_row_id, order_number, drawing_no, material_no, material_name, material_desc, unit_weight, num, total_weight ,remark,created_by ,edit_status </sql>
row_id, parent_row_id, order_number, drawing_no, material_no, material_name, material_desc, unit_weight, num, total_weight ,remark,created_by,created_time ,edit_status </sql>
</mapper>

6
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomOriginalPlmChildMapper.xml → nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomOriginalCadChildMapper.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nflg.product.bomnew.mapper.master.BomOriginalPlmChildMapper">
<mapper namespace="com.nflg.product.bomnew.mapper.master.BomOriginalCadChildMapper">
<resultMap id="BaseResultMap" type="com.nflg.product.bomnew.pojo.entity.BomOriginalPlmChildEntity">
<resultMap id="BaseResultMap" type="com.nflg.product.bomnew.pojo.entity.BomOriginalCadChildEntity">
<!--@mbg.generated-->
<!--@Table t_bom_original_plm_child -->
<!--@Table t_bom_original_cad_child -->
<id column="row_id" property="rowId" jdbcType="INTEGER"/>
<result column="uuid" property="uuid" jdbcType="VARCHAR"/>
<result column="parent_row_id" property="parentRowId" jdbcType="INTEGER"/>

44
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomOriginalCadParentMapper.xml Normal file
View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nflg.product.bomnew.mapper.master.BomOriginalCadParentMapper">
<resultMap id="BaseResultMap" type="com.nflg.product.bomnew.pojo.entity.BomOriginalCadParentEntity">
<!--@mbg.generated-->
<!--@Table t_bom_original_cad_parent -->
<id column="row_id" property="rowId" jdbcType="INTEGER"/>
<result column="uuid" property="uuid" jdbcType="VARCHAR"/>
<result column="chart_no" property="chartNo" jdbcType="VARCHAR"/>
<result column="rev" property="rev" jdbcType="INTEGER"/>
<result column="material_name" property="materialName" jdbcType="VARCHAR"/>
<result column="material_no" property="materialNo" jdbcType="VARCHAR"/>
<result column="qty" property="qty" jdbcType="INTEGER"/>
<result column="weight" property="weight" jdbcType="DECIMAL"/>
<result column="material" property="material" jdbcType="VARCHAR"/>
<result column="design_by" property="designBy" jdbcType="VARCHAR"/>
<result column="batch_no" property="batchNo" jdbcType="VARCHAR"/>
<result column="source" property="source" jdbcType="INTEGER"/>
<result column="status" property="status" jdbcType="INTEGER"/>
<result column="created_by" property="createdBy" jdbcType="VARCHAR"/>
<result column="created_time" property="createdTime" jdbcType="TIMESTAMP"/>
<result column="updated_by" property="updatedBy" jdbcType="VARCHAR"/>
<result column="updated_time" property="updatedTime" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
row_id, uuid, chart_no, rev, material_name, material_no, qty, weight, material, design_by, batch_no, source, status, created_by, created_time, updated_by, updated_time </sql>
<update id="clearPlmBom">
update t_bom_original_cad_parent set status=2 where row_id=#{rowId};
update t_bom_original_cad_child set status=2 where parent_row_id=#{rowId};
</update>
<delete id="delChildByParentRowIds">
delete from t_bom_original_cad_child where parent_row_id in
<foreach collection="rowIds" item="rowId" open="(" separator="," close=")">
#{rowId}
</foreach>
</delete>
</mapper>

43
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomOriginalPlmParentMapper.xml
View File

@ -1,43 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nflg.product.bomnew.mapper.master.BomOriginalPlmParentMapper">
<resultMap id="BaseResultMap" type="com.nflg.product.bomnew.pojo.entity.BomOriginalPlmParentEntity">
<!--@mbg.generated-->
<!--@Table t_bom_original_plm_parent -->
<id column="row_id" property="rowId" jdbcType="INTEGER"/>
<result column="uuid" property="uuid" jdbcType="VARCHAR"/>
<result column="chart_no" property="chartNo" jdbcType="VARCHAR"/>
<result column="rev" property="rev" jdbcType="INTEGER"/>
<result column="material_name" property="materialName" jdbcType="VARCHAR"/>
<result column="material_no" property="materialNo" jdbcType="VARCHAR"/>
<result column="qty" property="qty" jdbcType="INTEGER"/>
<result column="weight" property="weight" jdbcType="DECIMAL"/>
<result column="material" property="material" jdbcType="VARCHAR"/>
<result column="design_by" property="designBy" jdbcType="VARCHAR"/>
<result column="batch_no" property="batchNo" jdbcType="VARCHAR"/>
<result column="source" property="source" jdbcType="INTEGER"/>
<result column="status" property="status" jdbcType="INTEGER"/>
<result column="created_by" property="createdBy" jdbcType="VARCHAR"/>
<result column="created_time" property="createdTime" jdbcType="TIMESTAMP"/>
<result column="updated_by" property="updatedBy" jdbcType="VARCHAR"/>
<result column="updated_time" property="updatedTime" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
row_id, uuid, chart_no, rev, material_name, material_no, qty, weight, material, design_by, batch_no, source,
status, created_by, created_time, updated_by, updated_time
</sql>
<update id="clearPlmBom">
update t_bom_original_plm_parent set status=2 where row_id=#{rowId};
update t_bom_original_plm_child set status=2 where parent_row_id=#{rowId};
</update>
<delete id="delChildByParentRowIds">
delete from t_bom_original_plm_child where parent_row_id in
<foreach collection="rowIds" item="rowId" open="(" separator="," close=")">
#{rowId}
</foreach>
</delete>
</mapper>