|
|
@@ -257,54 +257,15 @@ public class SyCarryController {
|
|
|
}
|
|
|
//给表头赋值
|
|
|
syCarryPage.setSyCarryBList(syCarryBList);
|
|
|
- String demo = sheet.getRow(endX+1).getCell(0).getStringCellValue()+" || "+
|
|
|
- sheet.getRow(endX+2).getCell(0).getStringCellValue()+" || "+
|
|
|
- sheet.getRow(endX+3).getCell(0).getStringCellValue()+" || "+
|
|
|
- sheet.getRow(endX+4).getCell(0).getStringCellValue();
|
|
|
- syCarryPage.setDemo(demo);
|
|
|
- syCarryPage.setTotalNum(sheet.getRow(endX).getCell(3).getNumericCellValue());
|
|
|
+// String demo = sheet.getRow(endX+1).getCell(0).getStringCellValue()+" || "+
|
|
|
+// sheet.getRow(endX+2).getCell(0).getStringCellValue()+" || "+
|
|
|
+// sheet.getRow(endX+3).getCell(0).getStringCellValue()+" || "+
|
|
|
+// sheet.getRow(endX+4).getCell(0).getStringCellValue();
|
|
|
+// syCarryPage.setDemo(demo);
|
|
|
+ syCarryPage.setTotalNum(sheet.getRow(endX).getCell(6).getNumericCellValue());
|
|
|
return syCarryPage;
|
|
|
}
|
|
|
-// if(x<2) {
|
|
|
-// mainStrs.add(row.getCell(4)==null?"":row.getCell(4).toString());
|
|
|
-// 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){
|
|
|
-// if(oConvertUtils.isEmpty(row.getCell(1))||row.getCell(1).toString().length()<10){//如果这一列为空就退出
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// List<String> itemStrs=new ArrayList<>();
|
|
|
-// for (int i=0;i<row.getLastCellNum();i++){
|
|
|
-// Cell cell=row.getCell(i);
|
|
|
-// if(i<18&&i>14){
|
|
|
-// if(cell==null||cell.equals("")||cell.toString().length()<1){
|
|
|
-// 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();
|
|
|
-// //判断是否存储的为公式，此处本可以不加判断
|
|
|
-// if (cellType.equals(CellType.FORMULA)){
|
|
|
-// //获取公式，可以理解为已String类型获取cell的值输出
|
|
|
-// String cellFormula = cell.getCellFormula();
|
|
|
-// //System.out.println(cellFormula);
|
|
|
-// //执行公式，此处cell的值就是公式
|
|
|
-// CellValue evaluate = formulaEvaluator.evaluate(cell);
|
|
|
-// //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);
|
|
|
-// }
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 通过excel导入数据
|
liuchaohui