From f05ae31a579ffd7445ecf17b58a85fae40b86cf2 Mon Sep 17 00:00:00 2001 From: jing's Date: Sun, 21 Jan 2024 22:16:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/OptionalMbomMaterialMapper.java | 4 ++++ .../service/BomNewPbomParentService.java | 3 ++- .../service/OptionalMbomMaterialService.java | 23 +++++++++++++++++++ .../domain/OptionalMBom/OpMBomImortSap.java | 17 ++++++++++++++ .../mapper/master/BomNewMbomDetailMapper.xml | 21 +++++++++++++++++ 5 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OptionalMBom/OpMBomImortSap.java diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalMbomMaterialMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalMbomMaterialMapper.java index c8727f21..ccb4baeb 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalMbomMaterialMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalMbomMaterialMapper.java @@ -45,5 +45,9 @@ public interface OptionalMbomMaterialMapper extends BaseMapper searchList(@Param("rowId") Long rowId ); + + List getRecursionList(@Param("rowId") Long rowId ); + + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index e9eb6bdd..b8d8046d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -4,6 +4,7 @@ package com.nflg.product.bomnew.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; import com.alibaba.excel.enums.BooleanEnum; @@ -723,7 +724,7 @@ public class BomNewPbomParentService extends ServiceImpl allChild = getAllBom(bomRowId, 0); if (StrUtil.isBlank(rootParent.getOrderNo())) { - String orderNo = crmService.getOrderNo(rootParent.getMaterialNo()); + String orderNo = RandomUtil.randomNumbers(6);// crmService.getOrderNo(rootParent.getMaterialNo()); rootParent.setOrderNo(orderNo); } VUtils.isTure(StrUtil.isBlank(rootParent.getOrderNo())).throwMessage("没有获取到订单号"); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java index 772982f0..e4e4fd40 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java @@ -104,10 +104,33 @@ public class OptionalMbomMaterialService extends ServiceImpl childs) { + + if(CollectionUtil.isEmpty(childs)){ + return null; + } + + materialMainService.intiMaterialInfo(childs); + Map> groupMap = childs.stream().collect(Collectors.groupingBy(OptionalMbomMaterialListVO::getParentRowId)); + childs.forEach(child -> { + child.setChildNodes(groupMap.get(child.getRowId())); + + }); + //筛选出根 + List collect = childs.stream().filter(item -> Objects.equals(rowId,item.getRowId())).collect(Collectors.toList()); + return collect.get(0); + } + public Boolean importSap(Long rowId){ +List list=this.baseMapper.getRecursionList(rowId); + + OptionalMbomMaterialListVO parent=listToTree(rowId,list); + + + return true; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OptionalMBom/OpMBomImortSap.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OptionalMBom/OpMBomImortSap.java new file mode 100644 index 00000000..3f2d3c42 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OptionalMBom/OpMBomImortSap.java @@ -0,0 +1,17 @@ +package com.nflg.product.bomnew.service.domain.OptionalMBom; + +import com.nflg.product.bomnew.constant.BomConstant; +import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO; + +public class OpMBomImortSap { + + + + public ImportSapParamDTO buildSap(){ + ImportSapParamDTO result=new ImportSapParamDTO(); + result.setZID(parent.getRowId().toString()); + result.setI_WERKS(parent.getFacCode()); + result.setI_STLAN(BomConstant.SAP_YDBOM); + } + +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomDetailMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomDetailMapper.xml index 99bb030e..c152b23d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomDetailMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomDetailMapper.xml @@ -83,6 +83,27 @@ , dd._ids ) + + + + + UPDATE t_bom_new_mbom_detail SET material_back_status=#{materialBackStatus},modify_time=now()