From adb0cf7a8b5b9631a94ff40302ab9f8cb0ce8e7f Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 23 Dec 2024 13:29:23 +0800 Subject: [PATCH] =?UTF-8?q?44376=20=20=E6=AD=A6=E6=B1=89=20=20=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E8=AE=B0=E5=BD=95=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=20=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IMesProductionRecordReportExtService.java | 2 +- .../MesInspectionProductDataReportController.java | 42 ++++++++++++++++++++++ .../MesProductionRecordReportExtController.java | 6 ++-- .../MesProductionRecordReportExtService.java | 4 +-- 4 files changed, 48 insertions(+), 6 deletions(-) rename modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/{base => busi/report}/IMesProductionRecordReportExtService.java (91%) create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/{base => report}/MesProductionRecordReportExtController.java (91%) rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/{base => report}/MesProductionRecordReportExtService.java (95%) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProductionRecordReportExtService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesProductionRecordReportExtService.java similarity index 91% rename from modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProductionRecordReportExtService.java rename to modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesProductionRecordReportExtService.java index 7599d7d..be14013 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProductionRecordReportExtService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesProductionRecordReportExtService.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.ext.mes.api.base; +package cn.estsh.i3plus.ext.mes.api.busi.report; import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel; import cn.estsh.i3plus.pojo.base.bean.ListPager; diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java new file mode 100644 index 0000000..1ea1897 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.ext.mes.apiservice.controller.report; + +import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel; +import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.impp.framework.base.controller.BaseController; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ResultBean; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api("加工记录合并批量汇报查询报表") +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN) +public class MesInspectionProductDataReportController extends BaseController { + + @GetMapping(value = "/inspection-product-data-amount/report/query") + @ApiOperation(value = "加工记录合并批量汇报查询报表") + public ResultBean queryInspectionProductDataAmountReport(MesProductionRecordReportExtModel model, Pager pager) { + try { + ValidatorBean.beginValid(model) + .notNull(MesExtConstWords.COMPLETE_DATE_TIME_START, model.getCompleteDateTimeStart()) + .notNull(MesExtConstWords.COMPLETE_DATE_TIME_END, model.getCompleteDateTimeEnd()); + model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + return ResultBean.success("查询成功").setListPager(null) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProductionRecordReportExtController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesProductionRecordReportExtController.java similarity index 91% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProductionRecordReportExtController.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesProductionRecordReportExtController.java index dc8001d..688fa57 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProductionRecordReportExtController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesProductionRecordReportExtController.java @@ -1,6 +1,6 @@ -package cn.estsh.i3plus.ext.mes.apiservice.controller.base; +package cn.estsh.i3plus.ext.mes.apiservice.controller.report; -import cn.estsh.i3plus.ext.mes.api.base.IMesProductionRecordReportExtService; +import cn.estsh.i3plus.ext.mes.api.busi.report.IMesProductionRecordReportExtService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; @@ -34,7 +34,7 @@ public class MesProductionRecordReportExtController extends BaseController { ValidatorBean.beginValid(model) .notNull(MesExtConstWords.COMPLETE_DATE_TIME_START, model.getCompleteDateTimeStart()) .notNull(MesExtConstWords.COMPLETE_DATE_TIME_END, model.getCompleteDateTimeEnd()); -// model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); return ResultBean.success("查询成功").setListPager(productionRecordReportExtService.queryProductionRecordUnionWorkOrderLogReport(model, pager)) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordReportExtService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesProductionRecordReportExtService.java similarity index 95% rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordReportExtService.java rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesProductionRecordReportExtService.java index 2cab54d..22f61e7 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordReportExtService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesProductionRecordReportExtService.java @@ -1,6 +1,6 @@ -package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.report; -import cn.estsh.i3plus.ext.mes.api.base.IMesProductionRecordReportExtService; +import cn.estsh.i3plus.ext.mes.api.busi.report.IMesProductionRecordReportExtService; import cn.estsh.i3plus.ext.mes.apiservice.dao.report.IMesProductionRecordReportExtDao; import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;