From b98fe9b4b26fd02b68082728b9b54e449e04024e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Mon, 8 Jan 2024 12:30:27 +0800
Subject: [PATCH] =?UTF-8?q?EBOM=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/api/user/PBomApi.java  |  3 ++-
 .../service/BomNewPbomParentService.java       | 18 ++++++++++++++++--
 .../OriginalBom/OriginalBomToEBomConvert.java  |  3 ++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
index 2ec6cbab..9ba9f859 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
@@ -26,6 +26,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
@@ -68,7 +69,7 @@ public class PBomApi extends BaseApi {
 
     @PostMapping("exportWorkDetailsListByPage")
     @ApiOperation("导出工作列表")
-    public void exportWorkDetailsListByPage(@RequestBody BomNewPbomParentQuery query ,HttpServletResponse response) {
+    public void exportWorkDetailsListByPage(@RequestBody BomNewPbomParentQuery query ,HttpServletResponse response) throws IOException {
          bomNewPbomParentService.exportWorkDetailsListByPage(query,response);
     }
 
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 713d5fa0..5bb55c71 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
@@ -3,6 +3,7 @@ package com.nflg.product.bomnew.service;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.TypeReference;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -26,11 +27,14 @@ import nflg.product.common.constant.STATE;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.ttzero.excel.entity.ListMapSheet;
+import org.ttzero.excel.entity.ListSheet;
 import org.ttzero.excel.entity.Workbook;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
@@ -160,8 +164,18 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         return result;
     }
 
-    public void exportWorkDetailsListByPage(BomNewPbomParentQuery query,HttpServletResponse response){
-
+    public void exportWorkDetailsListByPage(BomNewPbomParentQuery query,HttpServletResponse response) throws IOException {
+        EecExcelUtil.setResponseExcelHeader(response, "bom明细列表");
+          new Workbook().addSheet(new ListSheet<BomNewPbomParentVO>() {
+            Long n = 1L;
+            @Override
+            protected List<BomNewPbomParentVO> more() {
+                query.setPage(n);
+                n++;
+                List<BomNewPbomParentVO> result=workDetailsListByPage(query).getRecords();
+                return  CollUtil.isNotEmpty(result)?result:null;
+            }
+        }).writeTo(response.getOutputStream());
     }
 
     public List<BomNewPbomParentVO> getChild(Long rowId) {
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 39460f9b..4831ad2d 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
@@ -282,7 +282,8 @@ public class OriginalBomToEBomConvert extends BaseConvert {
         childEntity.setParentRowId(parent.getEBomRowId()>0?parent.getEBomRowId(): parent.getRowId());
         childEntity.setOrderNumber("001");
         childEntity.setIdentityNo(StrUtil.join("-", parent.getMaterialNo(), material.getMaterialNo()));
-        childEntity.setDrawingNo(material.getDrawingNo());
+        //图号=物料编码
+        childEntity.setDrawingNo(material.getMaterialNo());
         childEntity.setMaterialNo(material.getMaterialNo());
         childEntity.setMaterialName(material.getMaterialName());
         childEntity.setMaterialDesc(material.getMaterialDesc());