朱园亮 / xingyun-erp · Commits

Commit a48a471e406e43daa3f28166c0cfe86873f46f04

Authored by 房远帅
1 parent d2951706

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

Inline Side-by-side
Showing 10 changed files with 11 additions and 10 deletions
... ... @@ -444,6 +444,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
444 444 dataMap.put("supplyUnit", supplyUnitDicItem == null ? "" : supplyUnitDicItem.getName());
445 445 dataMap.put("orderNo", data.getOrderNo());
446 446 dataMap.put("orderingUnitName", data.getOrderingUnitName());
  447 + dataMap.put("workshopName", data.getWorkshopName());
447 448 dataMap.put("customerTier", data.getCustomerTier());
448 449 dataMap.put("orderDate", data.getOrderDate() == null ? "" : data.getOrderDate().format(dateFormatter));
449 450
... ...
... ... @@ -39,7 +39,7 @@ public class OrderDetailStatisticsModel implements ExcelModel {
39 39 * 订货日期
40 40 */
41 41 @ExcelProperty("订货日期")
42   - @DateTimeFormat("yyyy/MM/dd")
  42 + @DateTimeFormat("yyyy/M/d")
43 43 private Date orderDate1;
44 44
45 45 /**
... ... @@ -64,7 +64,7 @@ public class OrderDetailStatisticsModel implements ExcelModel {
64 64 * 订货日期
65 65 */
66 66 @ExcelProperty("订货日期")
67   - @DateTimeFormat("yyyy/MM/dd")
  67 + @DateTimeFormat("yyyy/M/d")
68 68 private Date orderDate;
69 69
70 70 /**
... ... @@ -167,7 +167,7 @@ public class OrderDetailStatisticsModel implements ExcelModel {
167 167 * 发货日期
168 168 */
169 169 @ExcelProperty("发货日期")
170   - @DateTimeFormat("yyyy/MM/dd")
  170 + @DateTimeFormat("yyyy/M/d")
171 171 private Date deliveryDate;
172 172
173 173 /**
... ...
... ... @@ -27,7 +27,7 @@ public class QualityOrderDetailStatisticsModel implements ExcelModel {
27 27 * 订货日期
28 28 */
29 29 @ExcelProperty("订货日期")
30   - @DateTimeFormat("yyyy/MM/dd")
  30 + @DateTimeFormat("yyyy/M/d")
31 31 private Date orderDate;
32 32
33 33 /**
... ... @@ -124,7 +124,7 @@ public class QualityOrderDetailStatisticsModel implements ExcelModel {
124 124 * 发货日期
125 125 */
126 126 @ExcelProperty("发货日期")
127   - @DateTimeFormat("yyyy/MM/dd")
  127 + @DateTimeFormat("yyyy/M/d")
128 128 private Date deliveryDate;
129 129
130 130 /**
... ...
... ... @@ -24,7 +24,7 @@ public class StockInOrderDetailReportModel implements ExcelModel {
24 24 private String customerShortName;
25 25
26 26 @ExcelProperty(value = "订货日期", index = 3)
27   - @DateTimeFormat("yyyy/MM/dd")
  27 + @DateTimeFormat("yyyy/M/d")
28 28 private Date orderDate;
29 29
30 30 @ExcelProperty(value = "生产厂", index = 4)
... ... @@ -76,7 +76,7 @@ public class StockInOrderDetailReportModel implements ExcelModel {
76 76 private BigDecimal suggestedPrice;
77 77
78 78 @ExcelProperty(value = "交货日期", index = 20)
79   - @DateTimeFormat("yyyy/MM/dd")
  79 + @DateTimeFormat("yyyy/M/d")
80 80 private Date deliveryDate;
81 81
82 82 @ExcelProperty(value = "超价协调价", index = 21)
... ...
... ... @@ -15,7 +15,7 @@ import java.util.Date;
15 15 public class StockInboundOrderDetailReportModel implements ExcelModel {
16 16
17 17 @ExcelProperty(value = "日期", index = 0)
18   - @DateTimeFormat("yyyy/MM/dd")
  18 + @DateTimeFormat("yyyy/M/d")
19 19 private Date date;
20 20
21 21 @ExcelProperty(value = "订单编号", index = 1)
... ... @@ -28,7 +28,7 @@ public class StockInboundOrderDetailReportModel implements ExcelModel {
28 28 private String customerShortName;
29 29
30 30 @ExcelProperty(value = "订货日期", index = 4)
31   - @DateTimeFormat("yyyy/MM/dd")
  31 + @DateTimeFormat("yyyy/M/d")
32 32 private Date orderDate;
33 33
34 34 @ExcelProperty(value = "生产厂", index = 5)
... ... @@ -80,7 +80,7 @@ public class StockInboundOrderDetailReportModel implements ExcelModel {
80 80 private BigDecimal suggestedPrice;
81 81
82 82 @ExcelProperty(value = "交货日期", index = 21)
83   - @DateTimeFormat("yyyy/MM/dd")
  83 + @DateTimeFormat("yyyy/M/d")
84 84 private Date deliveryDate;
85 85
86 86 @ExcelProperty(value = "超价协调价", index = 22)
... ...