11

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java.rej

@@ -1,38 +0,0 @@
-diff a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java	(rejected hunks)
-@@ -640,13 +640,34 @@
- 					  }else{
- 						  sheet.setColumnWidth(x,3000);
- 					  }
--					  if(x > 7 && x < params.length-13){
-+					  if(x > 7 && x < params.length-18){
- 						  Cell cell1 = row2.createCell(x);
- 						  cell1.setCellValue(" ");
- 					  }else{
- 						  Cell cell1 = row2.createCell(x);
- 						  cell1.setCellValue(params1[x]);
--
-+					  }
-+					  //计算箱数
-+					  if(x == params.length-8){
-+						  Cell cell1 = row2.createCell(x);
-+						  cell1.setCellFormula("SUM(F2-E2+1)");
-+						  //cell1.setCellValue("=");
-+					  }
-+					  //体积
-+					  if(x == params.length-7){
-+						  Cell cell1 = row2.createCell(x);
-+						  cell1.setCellFormula("ROUND(SUM(S2*T2*U2*Y2/1000000),3)");
-+						  //cell1.setCellValue("=");
-+					  }
-+					  //总毛重
-+					  if(x == params.length-6){
-+						  Cell cell1 = row2.createCell(x);
-+						  cell1.setCellFormula("ROUND(SUM(R2*Y2),2)");
-+					  }
-+					  //总净重
-+					  if(x == params.length-5){
-+						  Cell cell1 = row2.createCell(x);
-+						  cell1.setCellFormula("ROUND(SUM(Q2*Y2),2)");
- 					  }
- 
- 				  }