推书调整，发运明细导出

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

@@ -735,7 +735,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
   @AutoLog(value = "发运明细查询订单")
   @ApiOperation(value="发运明细查询订单", notes="发运明细查询订单")
   @GetMapping(value = "/queryOrderData")
-  public Result<IPage<OrderDataVo>> queryOrderData(String itemNumber,String account,String startDeliveryDate,String endDeliveryDate,String smallPo,
+  public Result<IPage<OrderDataVo>> queryOrderData(String itemNumber,String account,String startDeliveryDate,String endDeliveryDate,String smallPo,String refer,
 												   String salesman,String customerName,String flourOrGarment,String preDeliveryDateS,String preDeliveryDateE,
 												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -771,9 +771,17 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  if (oConvertUtils.isNotEmpty(smallPo)) {
 		  queryWrapper.like("b.small_po", smallPo);
 	  }
+	  if(oConvertUtils.isNotEmpty(refer)){
+	  	if(refer.equals("1")){
+			queryWrapper.le("b.surplus_num", 0);
+		}else{
+			queryWrapper.gt("b.surplus_num", 0);
+		}
+
+	  }
 	  queryWrapper.eq("a.del_flag", 0);
 	  queryWrapper.eq("b.del_flag", 0);
-	  queryWrapper.gt("b.surplus_num", 0);
+
 //	  queryWrapper.gt("a.order_date","2021-12-30");
 //	  queryWrapper.groupBy("a.order_number,a.customer_abbreviation,a.sales_department,a.salesman,a.account,b.pre_delivery_date,a.order_remarks," +
 //			  "b.item_number,b.small_po,b.inventory_name,b.colour,b.distribution_point,b.pack_id,b.coding_rules");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -5,7 +5,7 @@
     <select id="syShippingOrderPageList" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder">
   select a.id,a.shipping_order_number as shippingOrderNumber,b.order_number as orderNumber,a.export_invoice_no as exportInvoiceNo,
   b.distribution_point as distributionPoint,a.unit_in_operation as unitInOperation,a.box_number as boxNumber,b.garment_factory as garmentFactory,
-  sum(b.gross_weight) as totalGrossWeight,case when b.ready_fabric != '成衣' then sum(b.volume) else a.total_volume end as totalVolume,b.box_number as planQuantity,b.client_abbreviation as clientAbbreviation,
+  sum(b.gross_weight) as totalGrossWeight,case when b.ready_fabric != '成衣' then b.volume else sum(b.volume) end as totalVolume,b.box_number as planQuantity,b.client_abbreviation as clientAbbreviation,
   a.money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,
   a.consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,a.the_final_shipping_date as theFinalShippingDate,
   a.addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -182,9 +182,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setTailoringFabricItemId(itemli.getId());//成衣或者面料子表ID
                         syShippingOrderItem.setSmailPo(itemli.getSmallPo());
                         syShippingOrderItem.setGrossWeight(itemli.getGrossWeight());
-                        totalGrossWeight.add(itemli.getGrossWeight());
+                        totalGrossWeight = totalGrossWeight.add(itemli.getGrossWeight());
                         syShippingOrderItem.setNetWeight(itemli.getNetWeight());
-                        syShippingOrderItem.setVolume(syShippingOrder.getTatolVolume());//体积
+                        syShippingOrderItem.setVolume(syShippingOrder.getTotalVolume());//体积
                         totalVolume = syShippingOrder.getTatolVolume();
                         syShippingOrderItem.setDistributionPoint(itemli.getDistributionPoint());
                         //单价 = 总金额/净重
@@ -247,10 +247,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setDelFlag("0");
                         syShippingOrderItem.setSmailPo(lit.getSmallPo());
                         syShippingOrderItem.setGrossWeight(lit.getTotalGrossWeight());//毛重
-                        totalGrossWeight.add(lit.getTotalGrossWeight());
+                        totalGrossWeight = totalGrossWeight.add(lit.getTotalGrossWeight());
                         syShippingOrderItem.setNetWeight(lit.getTotalNetWeight());//净重
                         syShippingOrderItem.setVolume(lit.getTotalVolume());//体积
-                        totalVolume.add(lit.getTotalVolume());
+                        totalVolume = totalVolume.add(lit.getTotalVolume());
                         syShippingOrderItem.setDistributionPoint(lit.getDistributionPoint());
                         syShippingOrderItem.setUnitPrice(lit.getUnitPrice());
                         syShippingOrderItem.setPreShipmentDate(lit.getHod());