From 9838d37410db94def261340bcaf23c37870e2a8d Mon Sep 17 00:00:00 2001 From: luoliming Date: Sat, 9 Dec 2023 23:22:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/api/user/OriginalBomApi.java | 9 ++++++--- .../product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java | 2 +- .../nflg/product/bomnew/service/MaterialMainService.java | 2 +- .../domain/OriginalBom/OriginalBomToEBomConvert.java | 5 +++-- .../mapper/master/BomNewOriginalParentMapper.xml | 3 +++ 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java index 7f5b2277..1aba0dc3 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java @@ -49,6 +49,8 @@ public class OriginalBomApi extends BaseApi { @Resource BomNewOriginalParentService originalParentService; + @Resource + MaterialService materialService; @PostMapping("bomPage") @ApiOperation("原始BOM-列表") @@ -148,12 +150,11 @@ public class OriginalBomApi extends BaseApi { return ResultVO.success(true); } - @Resource - MaterialService materialService; + @ApiOperation("testaddMaterial") @GetMapping("新增物料") @Transactional(rollbackFor = Exception.class) - public ResultVO importBom(@RequestParam(value = "drawingNo" ,required = false)String drawingNo, + public ResultVO testaddMaterial(@RequestParam(value = "drawingNo" ,required = false)String drawingNo, @RequestParam(value = "materialName" ,required = false)String materialName, @RequestParam("materialCategoryCode")String materialCategoryCode) throws IOException { @@ -162,4 +163,6 @@ public class OriginalBomApi extends BaseApi { } + + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java index 7d65549d..31de5528 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java @@ -32,7 +32,7 @@ public class BomNewOriginalExcelDTO extends BaseImportExcelDTO { private String materialName; @ExcelColumn("材料") - private String material; + private String excelMaterial; @ExcelColumn(value = "数量") 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 f533b2ab..91757546 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 @@ -61,7 +61,7 @@ public class MaterialMainService extends ServiceImpl materialMp = ListCommonUtil.listToMap(materialBaseInfos, BaseMaterialVO::getMaterialNo); for (T t : data) { if (StrUtil.isNotBlank(t.getMaterialNo()) && materialMp.containsKey(t.getMaterialNo())) { - BeanUtil.copyProperties(materialMp.get(t.getMaterialNo()), t); + BeanUtil.copyProperties(materialMp.get(t.getMaterialNo()), t, "material"); } } } 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 17ad3f35..155a9df7 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 @@ -90,7 +90,7 @@ public class OriginalBomToEBomConvert extends BaseConvert { return; } //子节点 - List parentChild = bomDetail.stream().filter(u -> u.getParentRowId().equals(parentEnt.getBomRowId()) ).collect(Collectors.toList()); + 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()); //无编码 if (StrUtil.isBlank(parentEnt.getMaterialNo())) { @@ -206,7 +206,8 @@ public class OriginalBomToEBomConvert extends BaseConvert { List list1 = entry.getValue(); BomOriginalListVO one = list1.get(0); 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())); } result.add(one); diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml index d846d59b..e4afcf2b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml @@ -51,6 +51,9 @@ and created_time> DATE_ADD(now(), INTERVAL -3 DAY) + + and status=1 + and drawing_no in