Merge branch 'deliveryGoods12111' into uat

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/pdf/PDFUtil.java

@@ -8,6 +8,8 @@ import com.itextpdf.text.pdf.draw.LineSeparator;
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -260,7 +262,13 @@ public class PDFUtil {
         table1.addCell(createCell("客户名称： " +receivingNote.getCustomerName(), headfont, Element.ALIGN_LEFT, 1, false));
         table1.addCell(createCell("TMS运单号： " +receivingNote.getShipmentNumber(), headfont, Element.ALIGN_LEFT, 1, false));
 //        table1.addCell(createCell("收货地址： " +receivingNote.getShipToAddress(), headfont, Element.ALIGN_LEFT, 1, false));
-        table1.addCell(createCell("经办人： " +receivingNote.getAgent(), headfont, Element.ALIGN_RIGHT, 2, false));
+        //table1.addCell(createCell("经办人： " +receivingNote.getAgent(), headfont, Element.ALIGN_RIGHT, 2, false));
+        //时间格式校验
+        Date date=new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        table1.addCell(createCell("用户签收确认： " +receivingNote.getAgent(), headfont, Element.ALIGN_RIGHT, 2, false));
+        table1.addCell(createCell( "签收日期： "+  calendar.get(Calendar.YEAR)+"年"+(calendar.get(Calendar.MONTH)+1)+"月"+calendar.get(Calendar.DATE)+"日", headfont, Element.ALIGN_RIGHT, 10, false));
         document.add(table1);
 //        Paragraph paragraph1 = new Paragraph("客户名称： " +receivingNote.getCustomerName() +"                           " +
 //        "                                                     运单号： " +receivingNote.getShipmentNumber(), namefont);