From 55cc86a9acf9fe6da1b774991bcfd8f58038096c Mon Sep 17 00:00:00 2001 From: yxw Date: Tue, 5 Dec 2023 14:09:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=BE=E4=B8=8B=E5=B7=A5=E4=BD=8D=E8=8A=82?= =?UTF-8?q?=E6=8B=8DPLC=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jx/ISxWorkCellTaktCollectPlcCfgService.java | 19 ++++++++--- .../jx/SxWorkCellTaktCollectPlcCfgController.java | 38 +++++++++++++++++++++- .../jx/SxWorkCellTaktCollectPlcCfgService.java | 15 ++++++++- .../mes/pojo/bean/SxWorkCellTaktCollectPlcCfg.java | 2 +- 4 files changed, 67 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/jx/ISxWorkCellTaktCollectPlcCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/jx/ISxWorkCellTaktCollectPlcCfgService.java index 1a5db4b..06be411 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/jx/ISxWorkCellTaktCollectPlcCfgService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/jx/ISxWorkCellTaktCollectPlcCfgService.java @@ -43,22 +43,33 @@ public interface ISxWorkCellTaktCollectPlcCfgService { ListPager querySxWorkCellTaktCollectPlcCfgByPager(SxWorkCellTaktCollectPlcCfg mesManageCode, Pager pager); /** - * 软删扭矩管理信息 + * 批量软删数据 * * @param ids id数组 * @param userName 操作人 */ - @ApiOperation("软删扭矩管理信息") + @ApiOperation("批量软删数据") int deleteWeaklySxWorkCellTaktCollectPlcCfgByIds(String[] ids, String userName); /** - * 批量禁用/启用详情 + * 批量禁用/启用数据有效性 * * @param ids id数组 * @param status 更新状态 * @param userName 操作人 * @return 操作行数 */ - @ApiOperation(value = "批量禁用/启用详情") + @ApiOperation(value = "批量禁用/启用数据有效性") + int updateSxWorkCellTaktCollectPlcCfgValid(String[] ids, int status, String userName); + + /** + * 批量禁用/启用工位节拍PLC配置状态 + * + * @param ids id数组 + * @param status 更新状态 + * @param userName 操作人 + * @return 操作行数 + */ + @ApiOperation(value = "批量禁用/启用工位节拍PLC配置状态") int updateSxWorkCellTaktCollectPlcCfgStatus(String[] ids, int status, String userName); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/jx/SxWorkCellTaktCollectPlcCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/jx/SxWorkCellTaktCollectPlcCfgController.java index 331b11b..f5c2d00 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/jx/SxWorkCellTaktCollectPlcCfgController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/jx/SxWorkCellTaktCollectPlcCfgController.java @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*; **/ @RestController @Api(tags = "松下工位节拍PLC配置 控制层") -@RequestMapping(CommonConstWords.BASE_URL_MES + "/work-cell-takt") +@RequestMapping(CommonConstWords.BASE_URL_MES + "/sx/" + "/work-cell-takt-collect-plc-cfg") public class SxWorkCellTaktCollectPlcCfgController { public static final Logger LOGGER = LoggerFactory.getLogger(SxWorkCellTaktCollectPlcCfgController.class); @@ -99,6 +99,24 @@ public class SxWorkCellTaktCollectPlcCfgController { } } + @PutMapping(value = "/update-valid-batch") + @ApiOperation(value = "批量禁用/启用详情", notes = "批量禁用/启用详情") + public ResultBean updateSxWorkCellTaktCollectPlcCfgValid(String[] ids, int status) { + try { + ConvertBean.modelSafeArrayNumber(ids, true); + //登陆用户 + SessionUser user = AuthUtil.getSessionUser(); + + workCellTaktCollectPlcCfgService.updateSxWorkCellTaktCollectPlcCfgValid(ids, status, user.getUserName()); + return ResultBean.success("修改成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + @PutMapping(value = "/update-status-batch") @ApiOperation(value = "批量禁用/启用详情", notes = "批量禁用/启用详情") public ResultBean updateSxWorkCellTaktCollectPlcCfgStatus(String[] ids, int status) { @@ -116,4 +134,22 @@ public class SxWorkCellTaktCollectPlcCfgController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + @DeleteMapping(value = "/delete-batch") + @ApiOperation(value = "批量禁用/启用详情", notes = "批量禁用/启用详情") + public ResultBean deleteWeaklySxWorkCellTaktCollectPlcCfgByIds(String[] ids) { + try { + ConvertBean.modelSafeArrayNumber(ids, true); + //登陆用户 + SessionUser user = AuthUtil.getSessionUser(); + + workCellTaktCollectPlcCfgService.deleteWeaklySxWorkCellTaktCollectPlcCfgByIds(ids, user.getUserName()); + return ResultBean.success("修改成功") + .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/serviceimpl/base/jx/SxWorkCellTaktCollectPlcCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/SxWorkCellTaktCollectPlcCfgService.java index 802f3a2..d36d361 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/SxWorkCellTaktCollectPlcCfgService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/SxWorkCellTaktCollectPlcCfgService.java @@ -118,7 +118,7 @@ public class SxWorkCellTaktCollectPlcCfgService implements ISxWorkCellTaktCollec int num = workCellTaktCollectPlcCfgRepository.updateByHqlWhere( wheres.toString(), - new String[]{MesExtConstWords.SYSTEM_SYNC_STATUS, MesExtConstWords.IS_VALID, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME}, + new String[]{MesExtConstWords.SYSTEM_SYNC_STATUS, MesExtConstWords.IS_DELETED, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME}, new Object[]{MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), userName, TimeTool.getNowTime(true)} ); return num; @@ -136,4 +136,17 @@ public class SxWorkCellTaktCollectPlcCfgService implements ISxWorkCellTaktCollec ); return num; } + + @Override + public int updateSxWorkCellTaktCollectPlcCfgValid(String[] ids, int status, String userName) { + StringBuffer wheres = new StringBuffer(); + HqlPack.getInPack(String.join(",", ids), MesExtConstWords.ID, wheres); + + int num = workCellTaktCollectPlcCfgRepository.updateByHqlWhere( + wheres.toString(), + new String[]{MesExtConstWords.SYSTEM_SYNC_STATUS, MesExtConstWords.STATUS, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME}, + new Object[]{MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue(), status, userName, TimeTool.getNowTime(true)} + ); + return num; + } } diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/SxWorkCellTaktCollectPlcCfg.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/SxWorkCellTaktCollectPlcCfg.java index 9054b6a..f43557f 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/SxWorkCellTaktCollectPlcCfg.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/bean/SxWorkCellTaktCollectPlcCfg.java @@ -39,7 +39,7 @@ public class SxWorkCellTaktCollectPlcCfg extends BaseBean implements Serializabl private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam("工作中心代码") + @ApiParam("工位代码") private String workCellCode; @Column(name = "PLC_CODE")