From a5a10166b79394c12b1596a37cafad7ac996efa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Wed, 27 Dec 2023 19:32:12 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=BD=ACEbom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/bomnew/api/user/OriginalBomApi.java | 9 +++++++++
 .../product/bomnew/service/BomNewEbomParentService.java  | 2 ++
 .../bomnew/service/BomNewOriginalParentService.java      | 2 +-
 .../domain/OriginalBom/OriginalBomToEBomConvert.java     | 2 +-
 .../resources/mapper/master/BomNewEbomParentMapper.xml   | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
index 7a53fc12..c691ad0e 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
@@ -205,4 +205,13 @@ public class OriginalBomApi extends BaseApi {
     }
 
 
+    @ApiOperation("导出-bom异常物料")
+    @PostMapping("downLoadErrorMaterial")
+    public void downLoadErrorMaterial(HttpServletResponse response){
+
+    }
+
+
+
+
 }
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 81161bda..027281c8 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
@@ -268,6 +268,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                         child.setDeviseUserCode(parent.getDeviseUserCode());
                         child.setDeviseName(parent.getDeviseName());
                         child.setDeptName(parent.getDeptName());
+                        child.setStatus(parent.getStatus());
+                        child.setEditStatus(parent.getEditStatus());
                         if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
                             child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
                             child.setStatus(parent.getStatus());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
index bb6b0fca..96514d7b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
@@ -186,7 +186,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
                         try {
                             if (MaterialshouldBomExistUtil.checkShouldBomExist(child)) {
                                 child.setCurrentVersion(OriginalConstant.NO_BOM_VERSION);
-                                child.setStatus(OriginalStatusEnum.UN_CONVERT.getValue());
+                                //child.setStatus(OriginalStatusEnum.UN_CONVERT.getValue());
                                 // child.setEditStatus(OriginalEditStatusEnum.HANDLER_CREATED.getValue());
                             }
                         }catch (Exception e){
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
index e7c24e62..3474ce84 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomConvert.java
@@ -280,7 +280,7 @@ public class OriginalBomToEBomConvert extends BaseConvert {
         childEntity.setMaterialDesc(material.getMaterialDesc());
         childEntity.setMaterialTexture(material.getMaterial());
         childEntity.setUnitWeight(parent.getUnitWeight());
-        childEntity.setNum(parent.getUnitWeight());
+        childEntity.setNum(new BigDecimal(parent.getNum()) );
         childEntity.setCreatedBy(SessionUtil.getUserCode());
         // this.eBomChildResult.add(childEntity);
         return childEntity;
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 68999133..fadc8450 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
@@ -75,7 +75,7 @@
             and devise_name=#{query.deviseName}
         </if>
         <if test="query.startDate!=null and query.startDate!=''">
-            and created_time between #{query.startDate} and #{query.endDate}
+            and created_time between #{query.startDate} and DATE_ADD(#{query.endDate}, INTERVAL 1 DAY)
         </if>
     </sql>