From b1ee64a574c2598bb96b75fdbb6fe85f748d9dce Mon Sep 17 00:00:00 2001 From: luoliming Date: Tue, 23 Jan 2024 23:37:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/BomNewPbomParentService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 21bc63bc..6ea99e8b 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 @@ -265,7 +265,7 @@ public class BomNewPbomParentService extends ServiceImpl Date: Wed, 24 Jan 2024 10:06:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8A=A01|=E8=87=AA=E5=88=B6;2|=E5=A4=96?= =?UTF-8?q?=E5=8D=8F;3|=E9=87=87=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewPbomParentService.java | 9 +++++++-- .../com/nflg/product/bomnew/service/MaterialService.java | 2 +- .../bomnew/service/domain/PBom/ConvertToMBom.java | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) 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 6ea99e8b..6a499d88 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 @@ -398,7 +398,7 @@ public class BomNewPbomParentService extends ServiceImpl mMap = materialService.batchAddMaterial(ImmutableList.of(toM)); // String materialNo = materialService.addMaterial(drawingNo, materialName, materialDesc, "201201"); String materialNo=mMap.get(key).getMaterialNo(); - return materialMainService.getMaterialBaseInfo(ImmutableList.of(materialNo)).get(0); + BaseMaterialVO resultD = materialMainService.getMaterialBaseInfo(ImmutableList.of(materialNo)).get(0); + //插入工艺包 + packageParam.setTechnologyPackageMaterialNo(materialNo); + insertTechnologyPackage(packageParam); + + return resultD; } @Transactional(rollbackFor = Exception.class) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java index b9d39887..7ece978c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java @@ -381,7 +381,7 @@ public class MaterialService { if (optional.isPresent()) { OaResult oaResult = optional.get(); materialMainEntity.setOaRowId(oaResult.getInstId()); - materialMainEntity.setProcessState(100); + // materialMainEntity.setProcessState(10); } } materialMainService.updateBatchById(entityList); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom.java index b9de2283..1dfb0efb 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom.java @@ -163,9 +163,9 @@ public class ConvertToMBom { * * @param */ - private void handEmptyMakePackage() { + private void handEmptyMakePackage(List childBomTree) { - List childBomTree = ConvertToMbomUtil.toTree(parent.getRowId(), allChildTreeList_1020, ConvertToMBomDTO::getRelParentRowId, ConvertToMBomDTO::getBomRowId); +// List childBomTree = ConvertToMbomUtil.toTree(parent.getRowId(), allChildTreeList_1020, ConvertToMBomDTO::getRelParentRowId, ConvertToMBomDTO::getBomRowId); for (ConvertToMBomDTO item : childBomTree) { if (VirtualPackageTypeEnum.DELIVERY_PACKAGE.equalsValue(item.getVirtualPartType())) { List makeChild = item.getChildNodes().stream().filter(u -> VirtualPackageTypeEnum.MAKING_PACKAGE.equalsValue(u.getVirtualPartType())).collect(Collectors.toList()); @@ -231,7 +231,7 @@ public class ConvertToMBom { recursionHandlerChild1020(item, directDeliveryPackage); } //处理制作包无下级的情况 - handEmptyMakePackage(); + handEmptyMakePackage(childBomTree); } From bc17c0cd3a17a7cde265a40947f1719dc74bcd90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Wed, 24 Jan 2024 11:06:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8A=A01|=E8=87=AA=E5=88=B6;2|=E5=A4=96?= =?UTF-8?q?=E5=8D=8F;3|=E9=87=87=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dto/AddVirtrualMaterialDTO.java | 2 ++ .../service/BomNewPbomParentService.java | 2 ++ .../bomnew/service/MaterialService.java | 3 ++ .../domain/EBom/VirtualPackageBase.java | 2 +- .../mapper/master/BomNewEbomParentMapper.xml | 30 +++++++++---------- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AddVirtrualMaterialDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AddVirtrualMaterialDTO.java index 46d627dd..38759472 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AddVirtrualMaterialDTO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AddVirtrualMaterialDTO.java @@ -16,6 +16,8 @@ public class AddVirtrualMaterialDTO { private String materialDesc ; private String materialCategoryCode; + private String projectType; + @ApiModelProperty("申请后返回的物料编码") private String materialNo; } 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 6a499d88..8c25e5a6 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 @@ -418,6 +418,7 @@ public class BomNewPbomParentService extends ServiceImpl mMap = materialService.batchAddMaterial(ImmutableList.of(toM)); // String materialNo = materialService.addMaterial(drawingNo, materialName, materialDesc, "201201"); String materialNo=mMap.get(key).getMaterialNo(); @@ -437,6 +438,7 @@ public class BomNewPbomParentService extends ServiceImpl - update t_bom_new_ebom_parent - set root_is=0, - user_root_is=0 - where last_version_is = 1; - update t_bom_new_ebom_parent a set a.root_is=1 ,a.user_root_is=1 where material_no not in (select material_no from ( - select b.material_no from t_bom_new_ebom_parent a - join t_bom_new_ebom_child b on a.row_id=b.parent_row_id - where a.last_version_is=1 ) b ) and last_version_is=1; - - - update t_bom_new_ebom_parent a left join (select material_no ,created_by from ( - select b.material_no ,b.created_by from t_bom_new_ebom_parent a + update t_bom_new_ebom_parent + set root_is=0, + user_root_is=0 + where last_version_is = 1; + update t_bom_new_ebom_parent a set a.root_is=1 ,a.user_root_is=1 where material_no not in (select material_no from ( + select b.material_no from t_bom_new_ebom_parent a join t_bom_new_ebom_child b on a.row_id=b.parent_row_id - where a.last_version_is=1 ) b ) t on a.material_no=t.material_no and a.created_by=t.created_by - set user_root_is=1 - where a.last_version_is=1 and t.created_by is null + where a.last_version_is=1 ) b ) and last_version_is=1; + + + update t_bom_new_ebom_parent a left join (select material_no ,created_by from ( + select b.material_no ,b.created_by from t_bom_new_ebom_parent a + join t_bom_new_ebom_child b on a.row_id=b.parent_row_id + where a.last_version_is=1 ) b ) t on a.material_no=t.material_no and a.created_by=t.created_by + set user_root_is=1 + where a.last_version_is=1 and t.created_by is null