From 4e7379646247c5b059106f63c7f1e9c8f535848e Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 19 七月 2022 15:16:58 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

---
 src/main/java/com/whyc/service/ProductBomApprovingService.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/whyc/service/ProductBomApprovingService.java b/src/main/java/com/whyc/service/ProductBomApprovingService.java
index 888f4e6..70e49c1 100644
--- a/src/main/java/com/whyc/service/ProductBomApprovingService.java
+++ b/src/main/java/com/whyc/service/ProductBomApprovingService.java
@@ -25,16 +25,21 @@
         Sheet sheet = workbook.getSheetAt(0);
         int lastRowNum = sheet.getLastRowNum();
         //鍙栫涓夎,骞朵互绗笁琛屽紑濮�
-        Row row2 = sheet.getRow(2);
+        Row row2 = sheet.getRow(1);
         short lastCellNum = row2.getLastCellNum();
         for (int i = 2; i < lastRowNum; i++) {
             ProductBomApproving bomApproving = new ProductBomApproving();
-            for (int j = 0; j < lastCellNum; j++) {
+            for (int j = 1; j < lastCellNum; j++) {
                 Row row = sheet.getRow(i);
                 Cell cell = row.getCell(j);
-                String cellValue = cell.getStringCellValue();
+                String cellValue = null;
+                Double cellValueInt = 0d;
+                if(j == 9){
+                    cellValueInt = cell.getNumericCellValue();
+                }else if(j!=15){
+                    cellValue = cell.getStringCellValue();
+                }
                 switch (j){
-                    case 0:{}break;
                     case 1:{bomApproving.setParentCode(cellValue);}break;
                     case 2:{bomApproving.setParentName(cellValue);}break;
                     case 3:{bomApproving.setParentModel(cellValue);}break;
@@ -43,7 +48,7 @@
                     case 6:{bomApproving.setSubName(cellValue);}break;
                     case 7:{bomApproving.setSubModel(cellValue);}break;
                     case 8:{bomApproving.setUnit(cellValue);}break;
-                    case 9:{bomApproving.setQuantity(Integer.parseInt(cellValue));}break;
+                    case 9:{bomApproving.setQuantity(cellValueInt.intValue());}break;
                     case 10:{bomApproving.setProducer(cellValue);}break;
                     case 11:{bomApproving.setMaterial(cellValue);}break;
                     case 12:{bomApproving.setThickness(cellValue);}break;

--
Gitblit v1.9.1