1:合同、订货单打印模板调整；2：报表导出日期格式调整；

@@ -444,6 +444,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
                     dataMap.put("supplyUnit", supplyUnitDicItem == null ? "" : supplyUnitDicItem.getName());
                     dataMap.put("supplyUnit", supplyUnitDicItem == null ? "" : supplyUnitDicItem.getName());
                     dataMap.put("orderNo", data.getOrderNo());
                     dataMap.put("orderNo", data.getOrderNo());
                     dataMap.put("orderingUnitName", data.getOrderingUnitName());
                     dataMap.put("orderingUnitName", data.getOrderingUnitName());
+                    dataMap.put("workshopName", data.getWorkshopName());
                     dataMap.put("customerTier", data.getCustomerTier());
                     dataMap.put("customerTier", data.getCustomerTier());
                     dataMap.put("orderDate", data.getOrderDate() == null ? "" : data.getOrderDate().format(dateFormatter));
                     dataMap.put("orderDate", data.getOrderDate() == null ? "" : data.getOrderDate().format(dateFormatter));
 
 

@@ -39,7 +39,7 @@ public class OrderDetailStatisticsModel implements ExcelModel {
      * 订货日期
      * 订货日期
      */
      */
     @ExcelProperty("订货日期")
     @ExcelProperty("订货日期")
-    @DateTimeFormat("yyyy/MM/dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date orderDate1;
     private Date orderDate1;
 
 
     /**
     /**
@@ -64,7 +64,7 @@ public class OrderDetailStatisticsModel implements ExcelModel {
      * 订货日期
      * 订货日期
      */
      */
     @ExcelProperty("订货日期")
     @ExcelProperty("订货日期")
-    @DateTimeFormat("yyyy/MM/dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date orderDate;
     private Date orderDate;
 
 
     /**
     /**
@@ -167,7 +167,7 @@ public class OrderDetailStatisticsModel implements ExcelModel {
      * 发货日期
      * 发货日期
      */
      */
     @ExcelProperty("发货日期")
     @ExcelProperty("发货日期")
-    @DateTimeFormat("yyyy/MM/dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date deliveryDate;
     private Date deliveryDate;
 
 
     /**
     /**

@@ -27,7 +27,7 @@ public class QualityOrderDetailStatisticsModel implements ExcelModel {
      * 订货日期
      * 订货日期
      */
      */
     @ExcelProperty("订货日期")
     @ExcelProperty("订货日期")
-    @DateTimeFormat("yyyy/MM/dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date orderDate;
     private Date orderDate;
 
 
     /**
     /**
@@ -124,7 +124,7 @@ public class QualityOrderDetailStatisticsModel implements ExcelModel {
      * 发货日期
      * 发货日期
      */
      */
     @ExcelProperty("发货日期")
     @ExcelProperty("发货日期")
-    @DateTimeFormat("yyyy/MM/dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date deliveryDate;
     private Date deliveryDate;
 
 
     /**
     /**

@@ -24,7 +24,7 @@ public class StockInOrderDetailReportModel implements ExcelModel {
     private String customerShortName;
     private String customerShortName;
 
 
     @ExcelProperty(value = "订货日期", index = 3)
     @ExcelProperty(value = "订货日期", index = 3)
-    @DateTimeFormat("yyyy/MM/dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date orderDate;
     private Date orderDate;
 
 
     @ExcelProperty(value = "生产厂", index = 4)
     @ExcelProperty(value = "生产厂", index = 4)
@@ -76,7 +76,7 @@ public class StockInOrderDetailReportModel implements ExcelModel {
     private BigDecimal suggestedPrice;
     private BigDecimal suggestedPrice;
 
 
     @ExcelProperty(value = "交货日期", index = 20)
     @ExcelProperty(value = "交货日期", index = 20)
-    @DateTimeFormat("yyyy/MM/dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date deliveryDate;
     private Date deliveryDate;
 
 
     @ExcelProperty(value = "超价协调价", index = 21)
     @ExcelProperty(value = "超价协调价", index = 21)

@@ -15,7 +15,7 @@ import java.util.Date;
 public class StockInboundOrderDetailReportModel implements ExcelModel {
 public class StockInboundOrderDetailReportModel implements ExcelModel {
 
 
     @ExcelProperty(value = "日期", index = 0)
     @ExcelProperty(value = "日期", index = 0)
-    @DateTimeFormat("yyyy/MM/dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date date;
     private Date date;
 
 
     @ExcelProperty(value = "订单编号", index = 1)
     @ExcelProperty(value = "订单编号", index = 1)
@@ -28,7 +28,7 @@ public class StockInboundOrderDetailReportModel implements ExcelModel {
     private String customerShortName;
     private String customerShortName;
 
 
     @ExcelProperty(value = "订货日期", index = 4)
     @ExcelProperty(value = "订货日期", index = 4)
-    @DateTimeFormat("yyyy/MM/dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date orderDate;
     private Date orderDate;
 
 
     @ExcelProperty(value = "生产厂", index = 5)
     @ExcelProperty(value = "生产厂", index = 5)
@@ -80,7 +80,7 @@ public class StockInboundOrderDetailReportModel implements ExcelModel {
     private BigDecimal suggestedPrice;
     private BigDecimal suggestedPrice;
 
 
     @ExcelProperty(value = "交货日期", index = 21)
     @ExcelProperty(value = "交货日期", index = 21)
-    @DateTimeFormat("yyyy/MM/dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date deliveryDate;
     private Date deliveryDate;
 
 
     @ExcelProperty(value = "超价协调价", index = 22)
     @ExcelProperty(value = "超价协调价", index = 22)