托书发票打印

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

@@ -721,7 +721,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 						 SyDeclarationElements elementEntity = syDeclarationElementsService.getById(li.getElementsId());
 						 //查询子表
 						 QueryWrapper<SyDeclarationElementsItem> itemQueryWrapper = new QueryWrapper<>();
-						 itemQueryWrapper.eq("sy_declaration_elements_id", li.getElementsId()).eq("del_flag", 0).orderByAsc("create_time");
+						 itemQueryWrapper.eq("sy_declaration_elements_id", li.getElementsId()).eq("del_flag", 0).orderByAsc("sort");
 						 List<SyDeclarationElementsItem> itemList1 = syDeclarationElementsItemService.list(itemQueryWrapper);
 						 if (itemList1.size() == 0) {
 							 map1.put("name", i + "、商品编码:");
@@ -849,7 +849,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 //				 workbook.write(outputStream);
 //
 //			 }
-				 else if (testName.equals("报关信息-发票")) {
+				 else if (testName.equals("报关信息-发票") || testName.equals("报关信息-发票-面料")) {
 
 					 List<Map<String, Object>> maiTouList = new ArrayList<Map<String, Object>>();
 
@@ -922,7 +922,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 workbook.write(outputStream);
 
 
-				 } else if (testName.equals("报关信息-合同")) {
+				 } else if (testName.equals("报关信息-合同") || testName.equals("报关信息-合同-面料")) {
 
 					 //获取当前日期减去60天
 					 Calendar calendar = Calendar.getInstance();
@@ -978,63 +978,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 workbook.write(outputStream);
 
 
-				 }  else if (testName.equals("报关信息-合同-面料")) {
 
-					 //获取当前日期减去60天
-					 Calendar calendar = Calendar.getInstance();
-					 calendar.setTime(date);
-					 calendar.add(Calendar.DAY_OF_MONTH, -60);
-					 String dateTime = sf.format(calendar.getTime());
-					 Date locale = sf.parse(dateTime);
-					 SimpleDateFormat sdf1 = new SimpleDateFormat("MMM'.'dd'th,' yyyy", Locale.UK); // 月日年
-					 entity.setDateTime(sdf1.format(locale));
-
-					 //出口口岸转大写拼音
-					 String exportPort = py.toPinYin(entity.getExportPort());
-					 entity.setExportPort(exportPort);
-
-					 //目的港+,+运抵国别转英文
-					 //查询数据字典获取英文
-					 List<DictModel> sysDicts = sysDictService.queryDictItemsByCode("port_of_destination");
-					 for (DictModel di : sysDicts) {
-						 if (di.getText().equals(entity.getDestinationPort())) {
-							 entity.setDestinationPort(di.getValue());
-						 }
-					 }
-					 List<DictModel> sysDicts1 = sysDictService.queryDictItemsByCode("country_of_arrival");
-					 for (DictModel di : sysDicts1) {
-						 if (di.getText().equals(entity.getArriveInCountry())) {
-							 entity.setArriveInCountry(di.getValue());
-						 }
-					 }
-
-					 TemplateExportParams params = new TemplateExportParams("D:\\单证模板\\" + testName + ".xlsx");
-
-					 //转map
-					 Field[] fields = entity.getClass().getDeclaredFields();
-					 for (Field field : fields) {
-						 field.setAccessible(true);
-						 map.put(field.getName(), field.get(entity));
-					 }
-					 //集合转map
-					 for (SyShippingOrderItem li : list) {
-						 Field[] fieldsList = li.getClass().getDeclaredFields();
-						 Map<String, Object> mapList = new HashMap<String, Object>();
-						 for (Field field : fieldsList) {
-							 field.setAccessible(true);
-							 mapList.put(field.getName(), field.get(li));
-						 }
-						 listMap.add(mapList);
-					 }
-
-					 map.put("item", listMap);
-
-					 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
-					 ServletOutputStream outputStream = response.getOutputStream();
-					 workbook.write(outputStream);
-
-
-				 }else if (testName.equals("报关信息-装箱单")) {
+				 }else if (testName.equals("报关信息-装箱单") || testName.equals("报关信息-装箱单-面料")) {
 					 List<Map<String, Object>> maiTouList = new ArrayList<>();
 					 boolean boo = true;
 

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

@@ -49,7 +49,7 @@ d.terms_of_deliveryvalue as termsOfDeliveryvalue
   select c.hs_code as hsCode,c.declaration_name as declarationName,a.id as id ,GROUP_CONCAT(DISTINCT b.id) as itemId,a.document_No as documentNo,a.create_by as createBy,
   a.export_invoice_no as exportInvoiceNo,a.container_number as containerNumber,a.garment_Factory as garmentFactory,
   b.supplier as supplier,a.plumbum_No as plumbumNo,a.customer_abbreviation as customerAbbreviation,b.account as acSetNo,
-  case when b.u8_Pid is null then sum(b.actual_declared_quantity) else sum(b.gross_weight) end as Total,concat(sum(b.actual_declared_quantity),'.00') as number,
+  case when b.u8_Pid is null then sum(b.actual_declared_quantity) else sum(b.gross_weight) end as Total,sum(b.actual_declared_quantity) as number,
    sum(b.rolls) as planQuantity,
   b.item_Number as itemNumber,b.small_Po as smallPo,round(sum(b.gross_weight),2) as grossWeight,
   round(sum(b.net_weight),2) as netWeight,'0' as totalVolume,b.distribution_Point as distributionPoint,