From a0947bb48c8619215a9ea3105b7265490d8d165a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Fri, 12 Apr 2024 18:45:15 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81Ebom=20=E6=AD=A3=E5=BC=8F=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E8=A1=A8=E5=8F=AA=E6=9F=A5=E6=9C=80=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/BomNewEbomParentService.java   | 3 +++
 .../main/resources/mapper/master/BomNewEbomParentMapper.xml    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 1b881d53..ca4371da 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -294,6 +294,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
     public Page<BomNewEbomParentVO> formalWorksheet(BomNewEbomParentQuery query) {
         Page<BomNewEbomParentVO> result = this.getBaseMapper().formalWorksheet(new Page<>(query.getPage(), query.getPageSize()), query);
 
+
         if (CollUtil.isNotEmpty(result.getRecords())) {
             materialMainService.intiMaterialInfo(result.getRecords());
         }
@@ -771,6 +772,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
             BomNewEbomParentEntity root = this.getById(paramDto.getBomRowId());
             VUtils.isTure(Objects.isNull(root)).throwMessage("Bom不存在");
+            //
+           // VUtils.isTure(root.getVirtrualPackageEnum()>0).throwMessage("已生成过虚拟包，不能2次生成");
             VUtils.isTure(!Objects.equals(root.getExceptionStatus(), EBomExceptionStatusEnum.OK.getValue()))
                     .throwMessage("异常状态下不允许生成虚拟包");
             LogRecordContext.putVariable("gvbom", root);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
index e59a1db5..3358edbd 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
@@ -136,7 +136,7 @@
 
     <!--BOM-正式工作表-->
     <select id="formalWorksheet" resultType="com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO">
-        select * , row_id as bomRowId from t_bom_new_ebom_parent where status=4
+        select * , row_id as bomRowId from t_bom_new_ebom_parent where status=4 and  last_version_is=1
         <include refid="whr"/>
     </select>