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

问题修复

This commit is contained in:
luoliming 2023-12-09 23:22:07 +08:00
parent 7f52eeb7d7
commit 9838d37410
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,8 @@ public class OriginalBomApi extends BaseApi {
@Resource @Resource
BomNewOriginalParentService originalParentService; BomNewOriginalParentService originalParentService;
@Resource
MaterialService materialService;
@PostMapping("bomPage") @PostMapping("bomPage")
@ApiOperation("原始BOM-列表") @ApiOperation("原始BOM-列表")
@ -148,12 +150,11 @@ public class OriginalBomApi extends BaseApi {
return ResultVO.success(true); return ResultVO.success(true);
} }
@Resource
MaterialService materialService;
@ApiOperation("testaddMaterial") @ApiOperation("testaddMaterial")
@GetMapping("新增物料") @GetMapping("新增物料")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ResultVO<String> importBom(@RequestParam(value = "drawingNo" ,required = false)String drawingNo, public ResultVO<String> testaddMaterial(@RequestParam(value = "drawingNo" ,required = false)String drawingNo,
@RequestParam(value = "materialName" ,required = false)String materialName, @RequestParam(value = "materialName" ,required = false)String materialName,
@RequestParam("materialCategoryCode")String materialCategoryCode) throws IOException { @RequestParam("materialCategoryCode")String materialCategoryCode) throws IOException {
@ -162,4 +163,6 @@ public class OriginalBomApi extends BaseApi {
} }
} }

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

@ -32,7 +32,7 @@ public class BomNewOriginalExcelDTO extends BaseImportExcelDTO {
private String materialName; private String materialName;
@ExcelColumn("材料") @ExcelColumn("材料")
private String material; private String excelMaterial;
@ExcelColumn(value = "数量") @ExcelColumn(value = "数量")

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

@ -61,7 +61,7 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
Map<String, BaseMaterialVO> materialMp = ListCommonUtil.listToMap(materialBaseInfos, BaseMaterialVO::getMaterialNo); Map<String, BaseMaterialVO> materialMp = ListCommonUtil.listToMap(materialBaseInfos, BaseMaterialVO::getMaterialNo);
for (T t : data) { for (T t : data) {
if (StrUtil.isNotBlank(t.getMaterialNo()) && materialMp.containsKey(t.getMaterialNo())) { if (StrUtil.isNotBlank(t.getMaterialNo()) && materialMp.containsKey(t.getMaterialNo())) {
BeanUtil.copyProperties(materialMp.get(t.getMaterialNo()), t); BeanUtil.copyProperties(materialMp.get(t.getMaterialNo()), t, "material");
} }
} }
} }

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

@ -90,7 +90,7 @@ public class OriginalBomToEBomConvert extends BaseConvert {
return; return;
} }
//子节点 //子节点
List<BomOriginalListVO> parentChild = bomDetail.stream().filter(u -> u.getParentRowId().equals(parentEnt.getBomRowId()) ).collect(Collectors.toList()); List<BomOriginalListVO> parentChild = bomDetail.stream().filter(u -> Objects.nonNull(u.getParentRowId()) && u.getParentRowId().equals(parentEnt.getBomRowId()) ).collect(Collectors.toList());
List<BomOriginalListVO> parentChildNoMaterilaNoList = parentChild.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList()); List<BomOriginalListVO> parentChildNoMaterilaNoList = parentChild.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList());
//无编码 //无编码
if (StrUtil.isBlank(parentEnt.getMaterialNo())) { if (StrUtil.isBlank(parentEnt.getMaterialNo())) {
@ -206,7 +206,8 @@ public class OriginalBomToEBomConvert extends BaseConvert {
List<BomOriginalListVO> list1 = entry.getValue(); List<BomOriginalListVO> list1 = entry.getValue();
BomOriginalListVO one = list1.get(0); BomOriginalListVO one = list1.get(0);
for (BomOriginalListVO item : list1) { for (BomOriginalListVO item : list1) {
one.setNum(one.getNum() + item.getNum());
one.setNum(Objects.nonNull(one.getNum())? one.getNum():0 +(Objects.nonNull(item.getNum())?item.getNum():0) );
one.setTotalWeight(NumberUtil.add(one.getTotalWeight(), item.getTotalWeight())); one.setTotalWeight(NumberUtil.add(one.getTotalWeight(), item.getTotalWeight()));
} }
result.add(one); result.add(one);

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

@ -51,6 +51,9 @@
and created_time> DATE_ADD(now(), INTERVAL -3 DAY) and created_time> DATE_ADD(now(), INTERVAL -3 DAY)
</if> </if>
</if> </if>
<if test="query.status==1">
and status=1
</if>
</if> </if>
<if test="query.drawingNos!=null and query.drawingNos.size()>0"> <if test="query.drawingNos!=null and query.drawingNos.size()>0">
and drawing_no in and drawing_no in