托书参照分组条件更改

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/SyShippingDetailsItem.java

@@ -399,7 +399,7 @@ public class SyShippingDetailsItem {
 		this.smallPo = orderDataVo.getSmallPo();
 		this.packId = orderDataVo.getPackId();
 		this.orderQuantity = orderDataVo.getQuantity();
-		this.orderRemainingQuantity = orderDataVo.getQuantity();
+		//this.orderRemainingQuantity = orderDataVo.getQuantity();
 		this.shipmentQuantity = orderDataVo.getQuantity();
 		this.salesTypeText = orderDataVo.getSalesTypeText();
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -405,7 +405,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 			  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1).eq("a.is_Reference",0);
 		      queryWrapper.orderByDesc("a.create_time");
-		      queryWrapper.groupBy("a.document_no");
+		      queryWrapper.groupBy("a.id");
 		  pageList = syShippingOrderService.queryTailoring(page,queryWrapper);
 
 
@@ -434,7 +434,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1);
 		  queryWrapper.eq("a.is_Reference",0);
 		  queryWrapper.orderByDesc("a.document_No");
-		  queryWrapper.groupBy("a.document_No,b.sy_shipping_details_item_id");
+		  queryWrapper.groupBy("a.id,b.sy_shipping_details_item_id");
 		  pageList = syShippingOrderService.queryFabric(page,queryWrapper);
 
 	  }
@@ -1145,7 +1145,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 ServletOutputStream outputStream = response.getOutputStream();
 					 workbook.write(outputStream);
 
-				 }else if (testName.equals("国外-报关信息-报关单")) {
+				 }else if (testName.equals("国外-报关信息-发票")) {
 
 				 	List<SyShippingOrderItem> listItem = new ArrayList<>();
 
@@ -1238,7 +1238,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 ServletOutputStream outputStream = response.getOutputStream();
 					 workbook.write(outputStream);
 
-				 }else if(testName.equals("国外-报关信息")){
+				 }else if(testName.equals("国外-报关信息-托书")){
 				 	List<Map<String,Object>> mergeMap = new ArrayList<>();
 
 					 entity.setDateTime(sdf1.format(entity.getShippingOrderDate()));