|
|
@@ -44,7 +44,7 @@ public class WorkShopExportVo {
|
|
|
@ExcelProperty("前道加工设备")
|
|
|
private String previousprocessdevice;
|
|
|
@ExcelProperty("前道完工时间")
|
|
|
- private String previousactualfinishdate;
|
|
|
+ private Date previousactualfinishdate;
|
|
|
@ExcelProperty("后道加工设备")
|
|
|
private String nextprocessdevice;
|
|
|
@ExcelProperty("冲突")
|
|
|
@@ -54,9 +54,9 @@ public class WorkShopExportVo {
|
|
|
@ExcelProperty("坯料计划编号")
|
|
|
private String blanknumber;
|
|
|
@ExcelProperty("承诺交货日期-起")
|
|
|
- private String promisedatestart;
|
|
|
+ private Date promisedatestart;
|
|
|
@ExcelProperty("承诺交货日期-止")
|
|
|
- private String promisedateend;
|
|
|
+ private Date promisedateend;
|
|
|
@ExcelProperty("订单产品")
|
|
|
private String outputorderproduct;
|
|
|
@ExcelProperty("工序")
|
|
|
@@ -86,15 +86,15 @@ public class WorkShopExportVo {
|
|
|
@ExcelProperty("作业状态")
|
|
|
private String workstatus;
|
|
|
@ExcelProperty("实际开工时间")
|
|
|
- private String actualstartdate;
|
|
|
+ private Date actualstartdate;
|
|
|
@ExcelProperty("实际完工时间")
|
|
|
- private String actualfinishdate;
|
|
|
+ private Date actualfinishdate;
|
|
|
@ExcelProperty("坯料生产状态")
|
|
|
private String productstatus;
|
|
|
@ExcelProperty("是否锁定")
|
|
|
private String lockmarkdetail;
|
|
|
@ExcelProperty("修改日期")
|
|
|
- private String modifydate;
|
|
|
+ private Date modifydate;
|
|
|
@ExcelProperty("修改人")
|
|
|
private String modifyusername;
|
|
|
@ExcelProperty("明细ID")
|
sucheng