解决面辅料缸号纯数字时数据异常

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -557,6 +557,7 @@ public class SyPackingListFabricController {
 					 mainStrs.add(row.getCell(8)==null?"":row.getCell(8).toString());
 					 mainStrs.add(row.getCell(12)==null?"":row.getCell(12).toString());
 					 mainStrs.add(row.getCell(16)==null?"":row.getCell(16).toString());
+					 mainStrs.add(row.getCell(20)==null?"":row.getCell(16).toString());
 				 }else if(x==2){
 					 main =new SyPackingListFabric(mainStrs.toArray(new String[mainStrs.size()]));
 				 }else if(x>3){
@@ -571,6 +572,7 @@ public class SyPackingListFabricController {
 								 throw new JeecgBootException("请填写第"+(x+1)+"行里的"+sheet.getRow(3).getCell(i));
 							 }
 						 }
+						 cell.setCellType(CellType.STRING);//获取的都转换成String
 						 FormulaEvaluator formulaEvaluator = new XSSFFormulaEvaluator((XSSFWorkbook) workbook1);
 						 //获取单元格内容的类型
 						 CellType cellType = cell.getCellType();
@@ -578,15 +580,14 @@ public class SyPackingListFabricController {
 						 if (cellType.equals(CellType.FORMULA)){
 							 //获取公式，可以理解为已String类型获取cell的值输出
 							 String cellFormula = cell.getCellFormula();
-							 System.out.println(cellFormula);
+							 //System.out.println(cellFormula);
 							 //执行公式，此处cell的值就是公式
 							 CellValue evaluate = formulaEvaluator.evaluate(cell);
-							 System.out.println(evaluate.formatAsString());
+							 //System.out.println(evaluate.formatAsString());
 							 itemStrs.add(evaluate.formatAsString());
 						 }else{
 							 itemStrs.add(cell.toString());
 						 }
-
 					 }
 					 SyPackingListFabricItem syPackingListFabricItem=new SyPackingListFabricItem(itemStrs.toArray(new String[itemStrs.size()]));
 					 items.add(syPackingListFabricItem);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabric.java

@@ -205,13 +205,19 @@ public class SyPackingListFabric implements Serializable {
 		containerNumber=strs[1];
 		garmentFactory=strs[2];
 		plumbumNo=strs[3];
-		exportInvoiceNo=strs[4];
+		try{
+			latestDateOfShipment=new SimpleDateFormat("yyyy-MM-dd").parse(strs[4]);
+		}catch (Exception e){
+			latestDateOfShipment=new SimpleDateFormat("yyyy-MM-dd").parse(new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
+		}
+		exportInvoiceNo=strs[5];
 		//createTime=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(strs[5]);
 		try{
-			preparedDate=new SimpleDateFormat("yyyy/m/d").parse(strs[5]);
+			preparedDate=new SimpleDateFormat("yyyy-MM-dd").parse(strs[6]);
 		}catch (Exception e){
 			preparedDate=new SimpleDateFormat("yyyy-MM-dd").parse(new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
 		}
+
 		//createTime=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(strs[0]) ;
 		//documentNo=strs[0];
 	}