对账单 导入

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/SyCarryController.java

@@ -235,7 +235,7 @@ public class SyCarryController {
 			 Row row=sheet.getRow(x);
 			 SyCarryB syCarryB = new SyCarryB();
 			 if(x>=3){
-			 	if(row==null || row.getCell(0)==null){
+			 	if(row==null || row.getCell(0)==null || row.getCell(0).toString().equals("")){
 			 		continue;
 				}
 			 	if(row.getCell(0).toString().equals("合计：")){
@@ -243,15 +243,17 @@ public class SyCarryController {
 					break;
 				}
 				syCarryB.setOrderDate(row.getCell(0).getDateCellValue());
-			 	syCarryB.setAllNum(row.getCell(1).getNumericCellValue());
-			 	syCarryB.setDetailedNum(row.getCell(2).getNumericCellValue());
-			 	syCarryB.setCoatHanger(row.getCell(3)==null?0:row.getCell(3).getNumericCellValue());
-			 	syCarryB.setContainerNo(row.getCell(4).getStringCellValue());
-			 	syCarryB.setInvoiceNo(row.getCell(5).getStringCellValue());
-			 	syCarryB.setPrice(row.getCell(6).getNumericCellValue());
-			 	syCarryB.setJhyByData(row.getCell(7).getStringCellValue());
-			 	syCarryB.setJhyNameData(row.getCell(8)==null?"":row.getCell(8).getStringCellValue());
-			 	syCarryB.setDemo(row.getCell(9)==null?"":row.getCell(9).getStringCellValue());
+			 	syCarryB.setInvoiceNo(row.getCell(1).getStringCellValue());
+			 	syCarryB.setAllNum(row.getCell(2).getNumericCellValue());
+			 	syCarryB.setCabinets(row.getCell(3).getNumericCellValue());
+			 	syCarryB.setDetailedNum(row.getCell(4).getNumericCellValue());
+			 	syCarryB.setCoatHanger(row.getCell(5)==null?0:row.getCell(5).getNumericCellValue());
+			 	syCarryB.setContainerNo(row.getCell(6).getStringCellValue());
+				syCarryB.setPrice(row.getCell(7).getNumericCellValue());
+			 	syCarryB.setTotalPrice(row.getCell(8).getNumericCellValue());
+			 	syCarryB.setJhyByData(row.getCell(9).getStringCellValue());
+			 	syCarryB.setReason(row.getCell(10)==null?"":row.getCell(10).getStringCellValue());
+			 	syCarryB.setDemo(row.getCell(11)==null?"":row.getCell(11).getStringCellValue());
 			 	syCarryBList.add(syCarryB);
 			 }
 		 }
@@ -262,7 +264,7 @@ public class SyCarryController {
 //				 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());
+		 syCarryPage.setTotalNum(syCarryBList.stream().mapToDouble(SyCarryB::getTotalPrice).sum());
 		 return syCarryPage;
 	 }