diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java index 140fca580..93cf0c102 100644 --- a/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java +++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java @@ -159,11 +159,5 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault()); return Date.from(zdt.toInstant()); } - public static String formatToYYYYMMDD(String inputDate, String inputFormat) throws Exception { - SimpleDateFormat inputFormatter = new SimpleDateFormat(inputFormat); - SimpleDateFormat outputFormatter = new SimpleDateFormat("yyyyMMdd"); - Date date = inputFormatter.parse(inputDate); - return outputFormatter.format(date); - } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineAssistantQtyController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineAssistantQtyController.java index 947070557..915986566 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineAssistantQtyController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineAssistantQtyController.java @@ -7,14 +7,10 @@ import java.util.Map; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import com.op.common.core.domain.ExcelCol; -import com.op.common.core.utils.poi.ExcelMapUtil; -import com.op.common.core.utils.poi.ExcelMesDayEffMapUtil; + import com.op.mes.domain.MesLineAssistant; -import com.op.mes.domain.vo.DynamicColumnVo; import com.op.mes.domain.vo.MesDailyEfficiencyVo; import com.op.mes.domain.vo.MesLineAssistantQtyVo; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -26,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; -import com.op.common.security.annotation.RequiresPermissions; import com.op.mes.domain.MesLineAssistantQty; import com.op.mes.service.IMesLineAssistantQtyService; import com.op.common.core.web.controller.BaseController; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java index dcb6c3a84..2453036a6 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java @@ -43,7 +43,7 @@ public interface IWCSInterfaceService { AjaxResult changeTransferResultTask(); - R prReportWork(MesReportWork mesReportWork); + R prReportWork(MesReportWork mesReportWork) throws Exception; Map getWhiteBoardEquPro7Days(BoardDTO boardDTO); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 0904dd195..666e059e2 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -39,6 +39,7 @@ import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.*; @@ -589,7 +590,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } @Override - public R prReportWork(MesReportWork mesReportWork) { + public R prReportWork(MesReportWork mesReportWork) throws Exception { //根据belong_work_order找到sap工单(子子母) List workOrders = mesReportWorkMapper.getSapWorkOrderByReport(mesReportWork.getReportCode());