预装箱单导出调整

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

@@ -1709,6 +1709,15 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                     cell.setCellStyle(cellStyle);
                     if(i==0){
                         cell.setCellValue("合计");
+                    }else if(i==x-11){
+                        System.out.println("list.getGroupName()\t"+list.getGroupName());
+                        System.out.println("list.getSmallPo()\t"+list.getSmallPo());
+                        System.out.println("list.getTotal()\t"+list.getTotal());
+                        System.out.println("list.getPacks()\t"+list.getPacks());
+                        if(list.getPacks()!=null){
+                            cell.setCellValue(list.getPacks().doubleValue());//箱数
+                        }
+                        //sheet.setColumnWidth(x-10,list.getTotalVolume().toString().length()*500);
                     }else if(i==x-10){
                         cell.setCellValue(list.getTotalBoxes().doubleValue());//箱数
                         //sheet.setColumnWidth(x-10,list.getTotalVolume().toString().length()*500);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingList.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.spapl.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -240,6 +241,11 @@ public class SyPreAssembledPackingList implements Serializable {
 	@ApiModelProperty(value = "是否tc功能0否1是")
 	private java.lang.String isTc;
 
+	@Excel(name = "包数", width = 15)
+	@ApiModelProperty(value = "包数")
+	@TableField(exist = false)
+	private BigDecimal packs;
+
 	public SyPreAssembledPackingList(){
 
 	}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -1076,6 +1076,11 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			if(bigDecimalMaps.containsKey(item.getGroupName())){
 				SyPreAssembledPackingList list=bigDecimalMaps.get(item.getGroupName());
 				list.setTotal(list.getTotal().add(item.getTotal()));
+				if(item.getPacks()!=null&&list.getPacks()!=null){
+					list.setPacks(list.getPacks().add(item.getPacks()));
+				}else if(item.getPacks()!=null){
+					list.setPacks(item.getPacks());
+				}
 				//list.setPrice(list.getPrice().add(list.getPrice()));
 				list.setTotalNetWeight(list.getTotalNetWeight().add(item.getTotalNetWeight()));
 				list.setTotalGrossWeight(list.getTotalGrossWeight().add(item.getTotalGrossWeight()));
@@ -1086,6 +1091,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			}else{
 				SyPreAssembledPackingList list=new SyPreAssembledPackingList();
 				list.setTotal(item.getTotal());
+				list.setPacks(item.getPacks());
 				//list.setPrice(item.getUnitPrice());
 				list.setTotalVolume(item.getTotalVolume());
 				list.setTotalNetWeight(item.getTotalNetWeight());
@@ -1108,6 +1114,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		for (SyPreAssembledPackingList entity : lists){//主表获取子表数据
 			SyPreAssembledPackingList list=bigDecimalMaps.get(entity.getGroupName());
 			entity.setTotal(list.getTotal());
+			entity.setPacks(list.getPacks());
 			//entity.setPrice(list.getPrice());
 			entity.setTotalVolume(list.getTotalVolume());
 			entity.setTotalNetWeight(list.getTotalNetWeight());