From d96125c408c7d2ae6f3b39cc4f0f3fc475441562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Wed, 9 Oct 2024 14:50:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/master/BomNewLogMapper.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewLogMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewLogMapper.xml
index 43b6749b..761c6247 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewLogMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewLogMapper.xml
@@ -35,7 +35,7 @@
             and op_user_job_no   =#{query.opUserJobNo}
         </if>
         <if test="query.startDate!=null and query.startDate!=''">
-            and op_time &gt;= #{query.startDate} and op_time &lt;= #{query.endDate}
+            and op_time &gt;= #{query.startDate} and op_time &lt;= DATE_ADD(#{query.endDate},1 day)
         </if>
     </sql>
 

From 09040c136062ea62a896e08ab74c6c9242c1796b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Wed, 9 Oct 2024 14:55:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/master/BomNewLogMapper.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewLogMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewLogMapper.xml
index 761c6247..b3d48895 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewLogMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewLogMapper.xml
@@ -35,7 +35,7 @@
             and op_user_job_no   =#{query.opUserJobNo}
         </if>
         <if test="query.startDate!=null and query.startDate!=''">
-            and op_time &gt;= #{query.startDate} and op_time &lt;= DATE_ADD(#{query.endDate},1 day)
+            and op_time &gt;= #{query.startDate} and op_time &lt; DATE_ADD(#{query.endDate},1 day)
         </if>
     </sql>
 

From f8a6845dce0739a3c85bb0dd404f1dde8ded1752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Wed, 9 Oct 2024 16:18:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?pbom-=E5=8F=91=E5=B8=83=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/BomNewPbomParentService.java  | 4 ++--
 1 file changed, 2 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 143d715c..7fb0acd1 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
@@ -1156,9 +1156,9 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                 this.delPBom(delNoReleaseBom);
             }
 
-            List<Long> bomRowIds = allBom.stream().filter(u -> PBomStatusEnum.WAIT_PUBLISH.equalsValue(u.getStatus()) && u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList());
+            List<Long> bomRowIds = allBom.stream().filter(u -> PBomStatusEnum.WAIT_PUBLISH.equalsValue(u.getStatus()) && u.getBomRowId() > 0 && !u.getDelIs().equals(1)).map(u -> u.getBomRowId()).collect(Collectors.toList());
 
-            List<String> parentMaterialNos = allBom.stream().filter(u -> PBomStatusEnum.WAIT_PUBLISH.equalsValue(u.getStatus()) && u.getBomRowId() > 0).map(u->u.getMaterialNo()).collect(Collectors.toList());
+            List<String> parentMaterialNos = allBom.stream().filter(u -> PBomStatusEnum.WAIT_PUBLISH.equalsValue(u.getStatus()) && u.getBomRowId() > 0 && !u.getDelIs().equals(1)).map(u->u.getMaterialNo()).collect(Collectors.toList());
 
             //Integer state = (parent.getMaterialNo().startsWith("31") && parent.getFacCode().equals(EBomConstant.MAIN_FACTORY_CODE_1010)) ? PBomStatusEnum.WAIT_FACTORY.getValue() : PBomStatusEnum.PUBLISH.getValue();
             Integer state = parent.getMaterialNo().startsWith("31") ? PBomStatusEnum.FACTORY_CONFIRM.getValue() : PBomStatusEnum.PUBLISH.getValue();