diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java index c627d5a2..2d86da63 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java @@ -117,12 +117,10 @@ public class SfcDispatchDto implements Serializable{ /** * 车间最早开始时间 */ - @ExcelColumn("车间最早开始时间") private LocalDateTime earliestStartDate; /** * 车间最晚结束时间 */ - @ExcelColumn("车间最晚结束时间") private LocalDateTime latestEndDate; /** * 是否已经派工 diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index 82a61981..8f6bd8a4 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java @@ -97,6 +97,18 @@ public class SfcDispatchServiceImpl extends ServiceImpl findSfcDispatchList(Map paramMap) { List list = sfcDispatchMapper.findSfcDispatchList(paramMap); if (list == null || list.size() <= 0) { +// List sfcDispatchDtoList=new ArrayList<>(); +// for(SfcDispatchDto sfcDispatchDto:list){ +// Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(CommonMethods.getSite(), sfcDispatchDto.getSfc())); +// if (sfcServiceById==null){ +// sfcDispatchDto.setDrawingsRevision(null); +// }else { +// String itemBo = sfcServiceById.getItemBo(); +// String path="/"+ StringUtil.trimHandle(itemBo)+"_"+StringUtil.trimRevision(itemBo)+"/"; +// sfcDispatchDto.setDrawingsRevision(path); +// } +// sfcDispatchDtoList.add(sfcDispatchDto); +// } return list; } @@ -233,8 +245,8 @@ public class SfcDispatchServiceImpl extends ServiceImpl