From c1aa782bde2d678e695fd828bc0e7686d98a259a Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 11 Jan 2024 18:10:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/mes/controller/MesReportWorkController.java | 9 +++++++-- .../java/com/op/mes/service/IMesReportWorkService.java | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index a8ed8f850..5d01a67da 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -127,8 +127,13 @@ public class MesReportWorkController extends BaseController { */ @RequiresPermissions("mes:reportWork:edit") @PutMapping("/reportSap") - public R reportSap(@RequestBody MesReportWork mesReportWork) { - return mesReportWorkService.reportSap(mesReportWork); + public AjaxResult reportSap(@RequestBody MesReportWork mesReportWork) { + R r = mesReportWorkService.reportSap(mesReportWork); + if(r.getCode()==200){ + return AjaxResult.success(); + }else{ + return AjaxResult.error("报工失败："+r.getMsg()); + } } /** diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java index a543a2638..ae6ff30ef 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.List; import com.op.common.core.domain.R; +import com.op.common.core.web.domain.AjaxResult; import com.op.mes.domain.*; import com.op.mes.domain.dto.LineChartDto; import com.op.mes.domain.dto.SysFactoryDto;