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

1.修复从CAD 获取

This commit is contained in:
大米 2024-05-16 10:58:33 +08:00
parent eafeca270c
commit 4a1c6c00d6
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,4 +40,6 @@ public interface BomNewOriginalChildMapper extends BaseMapper<BomNewOriginalChil
* @param rowIds * @param rowIds
*/ */
void syncOriginalBomToFormal(@Param("rowIds") List<Long> rowIds); void syncOriginalBomToFormal(@Param("rowIds") List<Long> rowIds);
void deleteChildByParentRowIds(@Param("parentRowIds") List<Long> parentRowIds);
} }

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

@ -101,9 +101,9 @@ public class BomOriginalCadChildEntity implements Serializable {
/** /**
* 项目类别 * 项目类别
*/ */
@TableField(value = "projectType") @TableField(value = "project_type")
@ApiModelProperty(value = "项目类别") @ApiModelProperty(value = "项目类别")
private String project_type; private String projectType;
/** /**
* *

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

@ -99,7 +99,7 @@ public class PlmBomToOriginalConvertV2 extends BaseConvert {
originalParentService.getBaseMapper().deleteByMap(ImmutableMap.of("drawing_no", parent.getChartNo())); originalParentService.getBaseMapper().deleteByMap(ImmutableMap.of("drawing_no", parent.getChartNo()));
List<Long> oldParentRowIds = oldOriginalParents.stream().map(u -> u.getRowId()).collect(Collectors.toList()); List<Long> oldParentRowIds = oldOriginalParents.stream().map(u -> u.getRowId()).collect(Collectors.toList());
if (CollUtil.isNotEmpty(oldParentRowIds)) { if (CollUtil.isNotEmpty(oldParentRowIds)) {
originalChildService.getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id", oldOriginalParents)); originalChildService.getBaseMapper().deleteChildByParentRowIds(oldParentRowIds);
} }
//有子级(原始BOM-直接覆盖) //有子级(原始BOM-直接覆盖)
if (CollUtil.isNotEmpty(childs)) { if (CollUtil.isNotEmpty(childs)) {

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

@ -86,4 +86,11 @@
#{rowId} #{rowId}
</foreach>; </foreach>;
</insert> </insert>
<delete id="deleteChildByParentRowIds">
delete from t_bom_new_original_child where parent_row_id in
<foreach collection="parentRowIds" item="rowId" open="(" separator="," close=")">
#{rowId}
</foreach>
</delete>
</mapper> </mapper>

2
nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java
View File

@ -33,7 +33,7 @@ public class SessionUtil {
*/ */
public static String getUserCode() { public static String getUserCode() {
//return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserCode).orElse("QHI17062100"); //return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getUserCode).orElse("QHI17062100");
return getUser().getUserCode(); return "NFLG20231201";
} }