From 3789b30bf777364109608e02c0b73d5aeafed6ee 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 13:48:20 +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

---
 .../bomnew/service/BomNewPbomParentService.java       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 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 188feda4..d437d446 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
@@ -473,7 +473,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public BaseMaterialVO createTechnologyPackage(TechnologyPackageParam packageParam) throws IOException {
+    public BaseMaterialVO createTechnologyPackage(TechnologyPackageParam packageParam) {
         VUtils.isTure(Objects.isNull(packageParam.getTechnologyPackageTypeRowId())).throwMessage("请选择工艺包类型");
         BomNewTechnologyPackageTypeEntity technologyPackageTypeEntity = technologyPackageTypeService.getById(packageParam.getTechnologyPackageTypeRowId());
         //单条物料
@@ -489,7 +489,14 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
             result = Convert.convert(BomNewPbomParentVO.class, parent);
         }
         materialMainService.intiMaterialInfo(ImmutableList.of(result));
-        VUtils.isTure(StrUtil.isBlank(result.getMaterialCategoryCode()) || !result.getMaterialCategoryCode().startsWith("20")).throwMessage("插入工艺包的物料需为制作物料");
+        //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());
         // 检查改图号是否已存在主数据中