diff --git a/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java b/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java index f3a5a14..1984618 100644 --- a/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java +++ b/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java @@ -44,4 +44,7 @@ public class LiuhuaViewData extends QueryPage { @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date firstReportDate; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date firstReportDate2; } diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java index f99c4d4..8ca1866 100644 --- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java @@ -707,6 +707,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { reportData.setType("reportData"); reportData.setStrQty(inData.getQtyApprove()); reportData.setWeight(inData.getApproveWeight()); + reportData.setRemark(inData.getRemark()); return R.ok().put("msg","操作成功!").put("transData",transData).put("badData",badData).put("reportData",reportData); } @Override diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml index 7cc99a3..af8bbf6 100644 --- a/src/main/resources/mapper/production/SoScheduledListMapper.xml +++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml @@ -220,7 +220,8 @@