From f2c217b5cab762ffaca84d4ab8815b49e8b91004 Mon Sep 17 00:00:00 2001
From: xiaoning <1097449274@qq.com>
Date: Fri, 5 Jul 2024 11:40:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A5=97=E6=96=99=E5=9B=BEPD?=
 =?UTF-8?q?F=E4=B8=8A=E4=BC=A0=EF=BC=9A=E8=BF=94=E5=9B=9E=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=A4=B1=E8=B4=A5=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=87=B3log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/jcsj/BomUploadController.java  | 55 ++++++++-----------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
index 91380b1..645ede2 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
@@ -24,7 +24,9 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -54,12 +56,20 @@ public class BomUploadController {
         String date=DateUtil.date().toString("yyyyMMdd");
         String path="/"+czbh+"_"+pl+"/"+date+"/ERP";
         ResultBean bean= bomUploadService.uploadZ( file ,  czbh,  pl,isupload,  req,path);
-        uploadPDF(tltList,  czbh,  pl,date);
+        Map map =(Map)bean.getData();
+        if(map.get("zt").equals("01")){
+             if (uploadPDF(tltList,  czbh,  pl,date)) {
+                 return bean;
+             }else {
+                 map.put("zt","03");
+                 return new ResultBean(map);
+             }
+        }
         return bean;
     }
 
     @Transactional
-    public ResultBean uploadPDF(MultipartFile[] fileList, String dcCh,String pl,String date)throws IOException {
+    public boolean uploadPDF(MultipartFile[] fileList, String dcCh,String pl,String date)throws IOException {
 
         for (MultipartFile file : fileList) {//船号_批量/日期/PDF（ERP）
             String url= com.dsic.gj_erp.util.FileUtil.handlerUpload(file,"/"+dcCh+"_"+pl+"/"+date+"/PDF");
@@ -88,6 +98,7 @@ public class BomUploadController {
             );
             List<DmTltpdf> list=new ArrayList<>();
             for (int i = 1; i <= pageNum; i++) {
+              try {
                 stripper.setStartPage(i);
                 stripper.setEndPage(i);
                 String s = stripper.getText(document);//本页文字内容
@@ -120,36 +131,11 @@ public class BomUploadController {
                 tltpdf.setHxkc(hxkc);
                 tltpdf.setQgkc(qgkc);
                 list.add(tltpdf);
-                //按行保存
-//            for (int j=0;j<a.length;j++){
-//                DmTltpdf tltpdf=new DmTltpdf();
-//                tltpdf.setDcCh(dcCh);
-//                tltpdf.setTh(th);
-//                tltpdf.setPl(pl);
-//                tltpdf.setTlth(tlth);
-//                tltpdf.setPageNum(i +"/"+pageNum);
-//                tltpdf.setRows((j+1) +"/"+a.length);
-//                tltpdf.setContent(a[j]);
-//                tltpdf.setFilePath(url);
-//                tltpdf.setHxcd(hxcd);
-//                tltpdf.setQgcd(qgcd);
-//                tltpdf.setHxkc(hxkc);
-//                tltpdf.setQgkc(qgkc);
-//                list.add(tltpdf);
-//                System.out.println("第 " + (j+1) +"/"+a.length+ " 行 :");
-//                System.out.println(a[j]);
-//            }
                 if (i==1)continue;
-//                Double ljzl=0.0;
-//                try {
-//                    String tlth1[]=s.split("DNV\\+CCS")[1].split("\r\n");
-//                     ljzl=new Double(tlth1[1]);
-//                }catch (Exception e){
-//                    String logMsg= StrUtil.format("数控套料图pdf读取错误--图号:{},页数:{}",th,i);
-//                    log.error(logMsg);
-//                }
-
-//                if (ljzl==0.0)continue;
+                Double ljzl=0.0;
+                    String tlth1[]=s.split("DNV\\+CCS")[1].split("\r\n");
+                     ljzl=new Double(tlth1[1]);
+                 if (ljzl==0.0)continue;
                 //根据当前页数据，修改BOM中零件属性 坡口 打磨 曲
                 int ljCount=  s.split("\\|")[0].split("\r\n").length;//零件数量
                 if (ljCount==11||ljCount==21||ljCount==31){
@@ -191,11 +177,16 @@ public class BomUploadController {
                         updateBom(sx,dcCh,pl,tlth,ljbh);
                     }
                 }
+              }catch (Exception e){
+                  String logMsg= StrUtil.format("数控套料图pdf读取错误--图号:{},页数:{}",th,i);
+                  log.error(logMsg);
+                  return false;
+              }
             }
             tltpdfService.saveBatch(list);
             document.close();
         }
-        return new ResultBean();
+        return true;
     }
 
     public  String[] getArrayByIndex(String[] oldArray,int startIndex,int endIndex){