装箱单--增加子表字段

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -134,7 +134,6 @@ public class SyPackingListTailoringController {
 		 //System.out.println("当前登录用户:"+((LoginUser)SecurityUtils.getSubject().getPrincipal()).getRealname());
 		 QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
 		 queryWrapper.eq("a.del_flag","0");//默认查询未删除
-		 //客户简称 分销点	预发货日期	小po	待添加查询条件
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){
 			 queryWrapper.eq("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());//客户简称
 		 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoringItem.java

@@ -107,6 +107,14 @@ public class SyPackingListTailoringItem implements Serializable {
 	@Excel(name = "总件数", width = 15)
 	@ApiModelProperty(value = "总件数")
 	private java.math.BigDecimal total;
+	/**计划装箱数量*/
+	@Excel(name = "计划装箱数量", width = 15,isStatistics = true)
+	@ApiModelProperty(value = "计划装箱数量")
+	private java.math.BigDecimal planQuantity;
+	/**计划装箱数量*/
+	@Excel(name = "实际装箱数量", width = 15,isStatistics = true)
+	@ApiModelProperty(value = "实际装箱数量")
+	private java.math.BigDecimal actualPackingQty;
 	/**净重/箱*/
     @Excel(name = "净重/箱", width = 15)
 	@ApiModelProperty(value = "净重/箱")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringItemMapper.xml

@@ -34,6 +34,8 @@
 			pieces_box,
 			box_number,
 			sum(total) total,/*件数*/
+			sum(total) plan_Quantity,/*计划装箱数量*/
+			sum(total) actual_Packing_Qty,/*实际装箱数量*/
 			net_weight,
 			sum(total_net_weight) total_net_weight,/*总净重*/
 			gross_weight,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -53,6 +53,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				SyPackingListTailoringItem item1=item;
 				BigDecimal boxNumber=boxNumber1.multiply(new BigDecimal(size.getProportion()));//获取该尺码件数
 				item1.setTotal(boxNumber);//该尺码件数
+				item1.setActualPackingQty(boxNumber);
+				item1.setPlanQuantity(size.getQuantity());//计划装箱数量
 				item1.setSize(size.getSize());//获取尺码
 				item1.setTotalPrice(boxNumber.multiply(item1.getUnitPrice()));//获取总价		箱数*单价-->件数*单价
 //				item1.setBoxNumber(boxNumber);//获取箱数
@@ -63,7 +65,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				BigDecimal volume=boxNumber.multiply(item1.getOuterBoxHeight());
 				volume=volume.multiply(item1.getOuterBoxLength());
 				volume=volume.multiply(item1.getOuterBoxWidth());
-				item1.setTotalVolume(volume);//获取总体积	长*宽*高*箱数
+				item1.setTotalVolume(volume.multiply(new BigDecimal(1000000)));//获取总体积	长*宽*高*箱数
 				item1.setSyPreAssembledPackingListItemId(size.getItemId());//获取到预装箱单子表id
 				item1.setSort(size.getNum());//获取序号
 				item1.setId(oConvertUtils.id());//获取到随机id
@@ -84,8 +86,10 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			for (SizeTable size : sizes){
 				SyPackingListTailoringItem item1=item;
 				BigDecimal boxNumber=boxNumber1.multiply(new BigDecimal(size.getProportion()));//获取该尺码件数
+				//item1.setPlanQuantity(size.getQuantity());//计划装箱数量
 				item1.setSize(size.getSize());//获取尺码信息
 				item1.setTotal(boxNumber);//该尺码件数
+				item1.setActualPackingQty(boxNumber);
 				item1.setTotalPrice(boxNumber.multiply(item1.getUnitPrice()));//获取总价		箱数*单价-->件数*单价
 				//item1.setBoxNumber(boxNumber);//获取箱数
 				boxNumber=boxNumber.divide(item.getPiecesBox(),6,BigDecimal.ROUND_HALF_UP);
@@ -95,7 +99,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				BigDecimal volume=boxNumber.multiply(item1.getOuterBoxHeight());//获取体积
 				volume=volume.multiply(item1.getOuterBoxLength());
 				volume=volume.multiply(item1.getOuterBoxWidth());
-				item1.setTotalVolume(volume);//获取总体积	长*宽*高*箱数
+				item1.setTotalVolume(volume.multiply(new BigDecimal(1000000)));//获取总体积	长*宽*高*箱数
 
 				//item.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
 				item1.setId(size.getItemId());//从尺码表中获取到id