From 998ac9bc50acea0a2e46c1ec4544e23e5bf9e081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Thu, 18 Apr 2024 14:19:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[excel-129]=E6=94=AF=E6=8C=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E4=BB=A3=E7=A0=81=E4=B8=BA10=E5=BC=80=E5=A4=B4?=
 =?UTF-8?q?=E7=9A=84=E7=89=A9=E6=96=99=E6=B7=BB=E5=8A=A0=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E5=8C=85=E5=88=B0=E4=B8=8A=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewPbomParentService.java      | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 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 d437d446..0291e6b8 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
@@ -480,23 +480,10 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         String drawingNo = packageParam.getDrawingNo();
         String materialName = packageParam.getMaterialName();
         String materialDesc = packageParam.getMaterialDesc();
-        BomNewPbomParentVO result = null;
-        if (packageParam.getRowIds().size() == 1) {
-            BomNewPbomChildEntity child = pbomChildService.getById(packageParam.getRowIds().get(0));
-            result = Convert.convert(BomNewPbomParentVO.class, child);
-        } else {
-            BomNewPbomParentEntity parent = this.getById(packageParam.getBomRowId());
-            result = Convert.convert(BomNewPbomParentVO.class, parent);
-        }
+        BomNewPbomParentVO result = getVO(packageParam);
+
         materialMainService.intiMaterialInfo(ImmutableList.of(result));
         //VUtils.isTure(StrUtil.isBlank(result.getMaterialCategoryCode()) || !result.getMaterialCategoryCode().startsWith("20")).throwMessage("插入工艺包的物料需为制作物料");
-        VUtils.isTure(StrUtil.isBlank(result.getMaterialCategoryCode())).throwMessage("物料分类代码不能为空");
-        if (result.getMaterialCategoryCode().startsWith("10")) {
-            //工艺包只能添加到上级
-            VUtils.isTure(!Objects.equals(packageParam.getLevelBelong(), 0)).throwMessage("10分类开头的物料，工艺包只能添加到上级");
-        } else if (!result.getMaterialCategoryCode().startsWith("20")) {
-            VUtils.isTure(true).throwMessage("插入工艺包的物料需为制作物料或10分类开头");
-        }
 
 //        drawingNo = StrUtil.join("", result.getDrawingNo(), technologyPackageTypeEntity.getDrawingNoSuffix());
         // 检查改图号是否已存在主数据中
@@ -523,18 +510,39 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         BaseMaterialVO resultD = materialMainService.getMaterialBaseInfo(ImmutableList.of(materialNo)).get(0);
         //插入工艺包
         packageParam.setTechnologyPackageMaterialNo(materialNo);
-        insertTechnologyPackage(packageParam);
+        insertTechnologyPackage(packageParam, result);
 
         return resultD;
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    private BomNewPbomParentVO getVO(TechnologyPackageParam packageParam) {
+        if (packageParam.getRowIds().size() == 1) {
+            BomNewPbomChildEntity child = pbomChildService.getById(packageParam.getRowIds().get(0));
+            return Convert.convert(BomNewPbomParentVO.class, child);
+        } else {
+            BomNewPbomParentEntity parent = this.getById(packageParam.getBomRowId());
+            return Convert.convert(BomNewPbomParentVO.class, parent);
+        }
+    }
+
     public void insertTechnologyPackage(TechnologyPackageParam technologyPackageParam) {
+        insertTechnologyPackage(technologyPackageParam, getVO(technologyPackageParam));
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void insertTechnologyPackage(TechnologyPackageParam technologyPackageParam, BomNewPbomParentVO vo) {
         VUtils.isTure(StrUtil.isBlank(technologyPackageParam.getTechnologyPackageMaterialNo())).throwMessage("工艺包物料编码不能为空");
         VUtils.isTure(CollUtil.isEmpty(technologyPackageParam.getRowIds())).throwMessage("请选择要插入工艺包的物料");
         if (technologyPackageParam.getRowIds().size() == 1 && Objects.isNull(technologyPackageParam.getLevelBelong())) {
             throw new NflgBusinessException(STATE.BusinessError, "单条物料时,请选择上下级");
         }
+        VUtils.isTure(StrUtil.isBlank(vo.getMaterialCategoryCode())).throwMessage("物料分类代码不能为空");
+        if (vo.getMaterialCategoryCode().startsWith("10")) {
+            //工艺包只能添加到上级
+            VUtils.isTure(!Objects.equals(technologyPackageParam.getLevelBelong(), 0)).throwMessage("10分类开头的物料，工艺包只能添加到上级");
+        } else if (!vo.getMaterialCategoryCode().startsWith("20")) {
+            VUtils.isTure(true).throwMessage("插入工艺包的物料需为制作物料或10分类开头");
+        }
         TechnologyPackageParamBuilder builder = new TechnologyPackageParamBuilder(technologyPackageParam);
         builder.builder();
         if (CollUtil.isNotEmpty(builder.getPackageParent())) {