huxy 2 年之前
父节点
当前提交
485e376a6b

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -70,10 +70,10 @@
         b.master_Metering,/*计量单位*/
         SUM(b.total) total,/*件数*/
         b.hod as  preDeliveryDate,/*预发货日期*/
-        sum(b.total_net_weight) totalnetweight,/*总净重*/
-        sum(b.total_gross_weight) totalgrossweight,/*总毛重*/
-        sum(b.total_volume) totalvolume,/*总体积*/
-        sum(b.total_price) totalprice,/*总价*/
+        b.total_net_weight totalnetweight,/*总净重*/
+        b.total_gross_weight totalgrossweight,/*总毛重*/
+        b.total_volume totalvolume,/*总体积*/
+        b.total_price totalprice,/*总价*/
         /*sum(b.total) totalquantity,*/
         b.factory_Unit_Price factoryUnitPrice,/*工厂单价*/
         a.spur_or_sub_order,/*采购委外订单号*/

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

@@ -542,11 +542,12 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				syPreAssembledPackingList.setTotalPrice(new BigDecimal("0"));
 				syPreAssembledPackingListMapper.insert(syPreAssembledPackingList);//往主表添加数据
 				for (SyPreAssembledPackingListItem item : items){
-					syPreAssembledPackingList.setTotal(syPreAssembledPackingList.getTotal().add(item.getTotal()));
-					syPreAssembledPackingList.setTotalBoxes(syPreAssembledPackingList.getTotalBoxes().add(item.getBoxNumber()));
-					syPreAssembledPackingList.setTotalNetWeight(syPreAssembledPackingList.getTotalNetWeight().add(item.getTotalNetWeight()));
-					syPreAssembledPackingList.setTotalGrossWeight(syPreAssembledPackingList.getTotalGrossWeight().add(item.getTotalGrossWeight()));
-					syPreAssembledPackingList.setTotalVolume(syPreAssembledPackingList.getTotalVolume().add(item.getTotalVolume()));
+					System.out.println("净重\t"+item.getTotalNetWeight());
+					syPreAssembledPackingList.setTotal(item.getTotal());
+					syPreAssembledPackingList.setTotalBoxes(item.getBoxNumber());
+					syPreAssembledPackingList.setTotalNetWeight(item.getTotalNetWeight());
+					syPreAssembledPackingList.setTotalGrossWeight(item.getTotalGrossWeight());
+					syPreAssembledPackingList.setTotalVolume(item.getTotalVolume());
 					List<SizeTable> sizes=item.getSizeTables();//获取尺码表信息
 					item.setSyPreAssembledPackingListId(syPreAssembledPackingList.getId());//获取主表id
 					BigDecimal boxNumber1=item.getBoxNumber();//获取箱数
@@ -563,13 +564,13 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 						//item1.setBoxNumber(boxNumber);//获取箱数
 
 						//boxNumber=boxNumber.divide(item.getPiecesBox(),6,BigDecimal.ROUND_HALF_UP);
-						boxNumber=item1.getBoxNumber();//根据箱数来算
+						/*boxNumber=item1.getBoxNumber();//根据箱数来算
 						item1.setTotalNetWeight(boxNumber.multiply(item1.getNetWeight()));//获取总净重		净重*箱数
 						item1.setTotalGrossWeight(boxNumber.multiply(item1.getGrossWeight()));//获取总毛重 	箱数*毛重/箱
 						BigDecimal volume=boxNumber.multiply(item1.getOuterBoxHeight());
 						volume=volume.multiply(item1.getOuterBoxLength());
 						volume=volume.multiply(item1.getOuterBoxWidth());
-						item1.setTotalVolume(volume.divide(new BigDecimal(1000000)));//获取总体积	长*宽*高*箱数
+						item1.setTotalVolume(volume.divide(new BigDecimal(1000000)));*///获取总体积	长*宽*高*箱数
 
 						item1.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
 						item1.setSort(size.getNum());//获取序号