预装箱单导出bug调整

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java

@@ -679,4 +679,11 @@ public class oConvertUtils {
 		}
 		return sb.toString();
 	}
+
+	public static BigDecimal getBigDecimal(BigDecimal b){
+		if (b==null){
+			return BigDecimal.ZERO;
+		}
+		return b;
+	}
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -1840,11 +1840,12 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                 String containerNumber=mains.get(i).getContainerNumber()==null?"空":mains.get(i).getContainerNumber();//集装箱代号-->改为集装箱号
 //                String customerAbbreviation=mains.get(i).getCustomerAbbreviation()==null?"空":mains.get(i).getCustomerAbbreviation();//客户名称
 
-                sysCount.setTotal(sysCount.getTotal().add(mains.get(i).getTotal()));
-                sysCount.setTotalBoxes(sysCount.getTotalBoxes().add(mains.get(i).getTotalBoxes()));
-                sysCount.setTotalGrossWeight(sysCount.getTotalGrossWeight().add(mains.get(i).getTotalGrossWeight()));
-                sysCount.setTotalNetWeight(sysCount.getTotalNetWeight().add(mains.get(i).getTotalNetWeight()));
-                sysCount.setTotalVolume(sysCount.getTotalVolume().add(mains.get(i).getTotalVolume()));
+
+                sysCount.setTotal(sysCount.getTotal().add(oConvertUtils.getBigDecimal(mains.get(i).getTotal())));
+                sysCount.setTotalBoxes(sysCount.getTotalBoxes().add(oConvertUtils.getBigDecimal(mains.get(i).getTotalBoxes())));
+                sysCount.setTotalGrossWeight(sysCount.getTotalGrossWeight().add(oConvertUtils.getBigDecimal(mains.get(i).getTotalGrossWeight())));
+                sysCount.setTotalNetWeight(sysCount.getTotalNetWeight().add(oConvertUtils.getBigDecimal(mains.get(i).getTotalNetWeight())));
+                sysCount.setTotalVolume(sysCount.getTotalVolume().add(oConvertUtils.getBigDecimal(mains.get(i).getTotalVolume())));
 //                System.out.println("mainsItemCode"+i+"\t");
 //                if(!customerAbbreviation.equals("BIG W")&&!customerAbbreviation.equals("BL")){
 //                    mains.get(i).setItemCode(" ");
@@ -1874,21 +1875,21 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                 sysGroupCount.setTotalVolume(new BigDecimal("0"));
                 for (SyPreAssembledPackingListVo sy : sys){
                     Row row = sheet.createRow(num+1);//列
-                    sysGroupCount.setTotal(sysGroupCount.getTotal().add(sy.getTotal()));
-                    sysGroupCount.setTotalBoxes(sysGroupCount.getTotalBoxes().add(sy.getTotalBoxes()));
-                    sysGroupCount.setTotalGrossWeight(sysGroupCount.getTotalGrossWeight().add(sy.getTotalGrossWeight()));
-                    sysGroupCount.setTotalNetWeight(sysGroupCount.getTotalNetWeight().add(sy.getTotalNetWeight()));
-                    sysGroupCount.setTotalVolume(sysGroupCount.getTotalVolume().add(sy.getTotalVolume()));
+                    sysGroupCount.setTotal(sysGroupCount.getTotal().add(oConvertUtils.getBigDecimal(sy.getTotal())));
+                    sysGroupCount.setTotalBoxes(sysGroupCount.getTotalBoxes().add(oConvertUtils.getBigDecimal(sy.getTotalBoxes())));
+                    sysGroupCount.setTotalGrossWeight(sysGroupCount.getTotalGrossWeight().add(oConvertUtils.getBigDecimal(sy.getTotalGrossWeight())));
+                    sysGroupCount.setTotalNetWeight(sysGroupCount.getTotalNetWeight().add(oConvertUtils.getBigDecimal(sy.getTotalNetWeight())));
+                    sysGroupCount.setTotalVolume(sysGroupCount.getTotalVolume().add(oConvertUtils.getBigDecimal(sy.getTotalVolume())));
                     String [] strs=sy.str().split(",");//切割
                     for (int i=0; i<strs.length;i++){
                         Cell cell = row.createCell(i);//横向
                         cell.setCellStyle(cellStyle2);
                         if(i>9&&i<12){
-                            cell.setCellValue(Integer.parseInt(strs[i]));
+                            cell.setCellValue(oConvertUtils.getInt(strs[i]));
                             continue;
                         }
                         else if(i>11&&i<15){
-                            cell.setCellValue(Double.parseDouble(strs[i]));
+                            cell.setCellValue(oConvertUtils.getDouble(strs[i],0));
                             continue;
                         }
                         cell.setCellValue(strs[i]);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/vo/SyPreAssembledPackingListVo.java

@@ -213,11 +213,17 @@ public class SyPreAssembledPackingListVo {
 	public String str(){
 		//单据号	订单号	款号	客户(简称)	预发货日期	小po	分销点	存货名称	颜色
 		//采购/委外订单号	数量 	箱数	总净重	总毛重	总体积	集装箱代号	集装箱号	预托书号	成衣工厂
+		String formatPreDeliveryDate = preDeliveryDate;
+		if (formatPreDeliveryDate == null){
+			formatPreDeliveryDate = "";
+		}else if (formatPreDeliveryDate.length() > 10){
+			formatPreDeliveryDate = formatPreDeliveryDate.substring(0,10);
+		}
 		return documentNo+","+
 		orderNumber+","+
 		itemNumber+","+
 		customerAbbreviation+","+
-		preDeliveryDate.substring(0,10)+","+
+				formatPreDeliveryDate+","+
 		smallPo+","+
 		distributionPoint+","+
 		inventoryName+","+