diff --git a/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java b/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java index d6810603..ac3695ef 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java +++ b/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java @@ -47,6 +47,9 @@ public class TobofsSaleoutDetailedDto { private String businesstype; //库存 开始 + @ExcelProperty(value = "库存-O出库完成时间") + private String businessDate; + @ExcelProperty(value = "库存-推送状态") private String newstate; @@ -62,8 +65,11 @@ public class TobofsSaleoutDetailedDto { @ExcelProperty(value = "库存-U8C主键") private String newsystemprimary; //库存 结束 - + //TOB交易红 开始 + @ExcelProperty(value = "交易-O交易成功时间") + private String successfulTradeDate; + @ExcelProperty(value = "交易-推送状态") private String newstate4; diff --git a/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java b/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java index 280c463d..80e6812b 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java +++ b/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java @@ -47,6 +47,9 @@ public class TocofsSaleoutDetailedDto { private String businesstype; //库存 开始 + @ExcelProperty(value = "库存-O出库完成时间") + private String businessDate; + @ExcelProperty(value = "库存-推送状态") private String newstate; @@ -64,6 +67,9 @@ public class TocofsSaleoutDetailedDto { //库存 结束 //交易红 开始 + @ExcelProperty(value = "交易-O交易成功时间") + private String successfulTradeDate; + @ExcelProperty(value = "交易红-推送状态") private String newstate2; diff --git a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml index 10fe75ff..0a9db093 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml +++ b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml @@ -438,6 +438,8 @@ + + @@ -462,6 +464,8 @@ + +