From 0408c2ef841ed5c0d43ccffa92f24ef2b0d3cae3 Mon Sep 17 00:00:00 2001 From: "logic.fang" Date: Mon, 16 Jun 2025 14:36:00 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"3533=20=E4=B8=BB=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8=E8=AE=BE=E8=AE=A1=E4=B8=8E=E5=BC=80=E5=8F=91=EF=BC=88?= =?UTF-8?q?=E5=AE=B9=E5=99=A8=E6=9D=A1=E7=A0=81=E4=B8=8E=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E8=A1=A8-=E6=8E=A5=E5=8F=A3=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=EF=BC=89"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit eaf858b6845252a02b3dd833db7a832bab7e6614. --- .../api/base/IMesContainerSnStationService.java | 4 ++ .../base/MesContainerSnStationController.java | 48 ++++++++++++++++++++-- .../base/MesContainerSnStationServiceImpl.java | 16 ++++++++ 3 files changed, 65 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesContainerSnStationService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesContainerSnStationService.java index 147c5f4..fe1d40a 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesContainerSnStationService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesContainerSnStationService.java @@ -19,6 +19,10 @@ public interface IMesContainerSnStationService { void doInsert(MesContainerSnStation mesContainerSnStation, String userName); + void doUpdate(MesContainerSnStation mesContainerSnStation, String userName); + + void doUpdateIsValid(List idList, Integer status, String organizeCode, String userName); + void deleteWeaklyByIds(List idList, String organizeCode, String userName); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesContainerSnStationController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesContainerSnStationController.java index 9f024b7..4936ed7 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesContainerSnStationController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesContainerSnStationController.java @@ -2,7 +2,9 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.base; import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesContainerSnStationService; import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesContainerSnStation; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -62,13 +64,53 @@ public class MesContainerSnStationController { } } - @DeleteMapping(value = "/delete-weakly") + @PostMapping("/update") + @ApiOperation(value = "编辑") + public ResultBean doUpdate(@RequestBody MesContainerSnStation mesContainerSnStation) { + try { + String userName = AuthUtil.getSessionUser().getUserName(); + ValidatorBean.checkNotNull(mesContainerSnStation.getOrganizeCode(), "工厂代码为空"); + mesContainerSnStationService.doUpdate(mesContainerSnStation, userName); + return ResultBean.success("编辑成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException imppException) { + return ResultBean.fail(imppException); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping("/update-isValid-by-id") + @ApiOperation(value = "批量根据id启用或禁用") + public ResultBean doUpdateIsValid(Long[] idList, Integer isValid, String organizeCode) { + try { + ValidatorBean.checkNotNull(organizeCode, "工厂代码为空"); + ValidatorBean.checkNotNull(idList, "请选择需要删除的信息"); + List ids = Arrays.asList(idList); + if (isValid != CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && + isValid != CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("状态值不符合要求，不允许操作"). + build(); + } + String userName = AuthUtil.getSessionUser().getUserName(); + mesContainerSnStationService.doUpdateIsValid(ids, isValid, organizeCode, userName); + return ResultBean.success("批量根据id启用或禁用成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException imppException) { + return ResultBean.fail(imppException); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping(value = "/delete-weakly") @ApiOperation(value = "批量软删除信息") - public ResultBean batchDeleteWeaklyByIds(@RequestBody Long[] idList) { + public ResultBean batchDeleteWeaklyByIds(@RequestBody Long[] idList, String organizeCode) { try { ValidatorBean.checkNotNull(idList, "请选择需要删除的信息"); + ValidatorBean.checkNotNull(organizeCode, "工厂代码为空"); List ids = Arrays.asList(idList); - String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); String userName = AuthUtil.getSessionUser().getUserName(); mesContainerSnStationService.deleteWeaklyByIds(ids, organizeCode, userName); return ResultBean.success("批量删除信息成功") diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesContainerSnStationServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesContainerSnStationServiceImpl.java index 5df253a..7cb375d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesContainerSnStationServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesContainerSnStationServiceImpl.java @@ -73,6 +73,22 @@ public class MesContainerSnStationServiceImpl implements IMesContainerSnStationS } @Override + public void doUpdate(MesContainerSnStation mesContainerSnStation, String userName) { + ConvertBean.saveOrUpdate(mesContainerSnStation, userName); + mesContainerSnStationRepository.update(mesContainerSnStation); + } + + @Override + public void doUpdateIsValid(List idList, Integer status, String organizeCode, String userName) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getInPackList(idList, "id", ddlPackBean); + mesContainerSnStationRepository.updateByProperties( + new String[]{"modifyUser", "modifyDatetime", "isValid"}, + new Object[]{userName, TimeTool.getNowTime(true), status }, + ddlPackBean); + } + + @Override public void deleteWeaklyByIds(List idList, String organizeCode, String userName) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getInPackList(idList, "id", ddlPackBean);