托书打印

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

@@ -607,17 +607,13 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 map.put("item", listMap);
 
 				 Workbook workbook = ExcelExportUtil.exportExcel(params,map);
-//				 File savefile = new File("C:\\Users\\Mr_zeng\\Desktop\\");
-//				 if (!savefile.exists()) {
-//					 savefile.mkdirs();
-//				 }
+
 				 ServletOutputStream outputStream = response.getOutputStream();
 
-//				 FileOutputStream fos = new FileOutputStream(outputStream);
 				 workbook.write(outputStream);
-//				 fos.close();
 
-			 }else if(testName.equals("报关信息-申报要素-成衣")){
+			 }
+			 else if(testName.equals("报关信息-申报要素-成衣")){
                  //传出的Map
 				 Map<String, Object> map = new HashMap<String, Object>();
 
@@ -670,7 +666,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 //				 workbook.write(fos);
 //				 fos.close();
 
-			 }if(testName.equals("报关信息-发票")){
+			 }
+			 else if(testName.equals("报关信息-发票")){
 
 				 Map<String, Object> map = new HashMap<String, Object>();
 
@@ -746,15 +743,13 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 map.put("item", listMap);
 
 				 Workbook workbook = ExcelExportUtil.exportExcel(params,map);
-//				 File savefile = new File("C:\\Users\\Mr_zeng\\Desktop\\");
-//				 if (!savefile.exists()) {
-//					 savefile.mkdirs();
-//				 }
 				 ServletOutputStream outputStream = response.getOutputStream();
-
-//				 FileOutputStream fos = new FileOutputStream(outputStream);
 				 workbook.write(outputStream);
-//				 fos.close();
+
+
+			 }else if(testName.equals("报关信息-合同")){
+
+
 
 			 }
 

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

@@ -79,7 +79,7 @@ SELECT GROUP_CONCAT(id) as id, sy_shipping_order_item_id as syShippingOrderItemI
 sum(number) as number, box_number as boxNumber, sum(gross_weight) as grossWeight, sum(net_weight) as netWeight, sum(volume) as volume,sum(total_price) as totalPrice,
 distribution_point as distributionPoint, container_code as containerCode, container_number as containerNumber, unit_price as unitPrice, pre_shipment_date as preShipmentDate,
 salesman, operating_department as operatingDepartment, purchase_outsourcing_order_no as purOrSubOrder, outsourcing_factory_for_procurement as outsourcingFactoryForProcurement,
- memo, sort, ready_fabric as readyFabric, tailoring_fabric_id as tailoringFabricId, tailoring_fabric_item_id as tailoringFabricItemId
+ memo, sort, ready_fabric as readyFabric, tailoring_fabric_id as tailoringFabricId, tailoring_fabric_item_id as tailoringFabricItemId,b.client_abbreviation as clientAbbreviation
  FROM sy_shipping_order_item where del_flag = 0 and sy_shipping_order_item_id = #{id}
 group by group_id
     </select>