From 452e53882394e849166829a298110ad253ad4320 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 23 Jul 2024 15:43:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87LOg=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/ExtProdOrgController.java | 2 +- .../base/MesEquipmentVariableService.java | 2 +- .../serviceimpl/busi/ProdExtOrgService.java | 57 +++++++++++++++------- 3 files changed, 41 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java index 054b419..4ef7d1b 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java @@ -326,7 +326,7 @@ public class ExtProdOrgController extends MesBaseController { .notNull(MesConstWords.WORK_CENTER_CODE, workCell.getWorkCenterCode()) .notNull(MesCommConstWords.AREA_CODE, workCell.getAreaCode()); - mesWorkCellService.update(workCell); + prodOrgService.updateMesWorkCell(workCell); return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java index e083810..33c6e8c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java @@ -85,7 +85,7 @@ public class MesEquipmentVariableService extends BaseMesService queryMesAreaByPager(MesArea mesArea, Pager pager) { @@ -395,23 +400,12 @@ public class ProdExtOrgService implements IProdExtOrgService { workCell.getAreaCode(), workCell.getWorkCenterCode(), workCell.getWorkCellCode()) .build(); } - /*if (MesEnumUtil.MES_WORK_CELL_TYPE.REWORK.getValue() == workCell.getWorkCellType()) { - MesWorkCell mesWorkCell = workCellRepository.getByProperty(new String[]{MesConstWords.ORGANIZE_CODE, MesConstWords.IS_DELETED, MesConstWords.IS_VALID, "workCenterCode", "workCellType"}, - new Object[]{workCell.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), workCell.getWorkCenterCode(), workCell.getWorkCellType()}); - if (mesWorkCell != null && !mesWorkCell.getId().equals(workCellDb.getId())) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) - .setErrorDetail("工位代码为【%s】，工位类型为【%s】的记录已存在", mesWorkCell.getWorkCellCode(), MesEnumUtil.MES_WORK_CELL_TYPE.valueOfDescription(workCell.getWorkCellType())) - .build(); - } - }*/ - workCellDb.setSeq(workCell.getSeq()); - workCellDb.setWorkCellName(workCell.getWorkCellName()); - workCellDb.setGrade(workCell.getGrade()); - ConvertBean.serviceModelUpdate(workCellDb, AuthUtil.getSessionUser().getUserName()); - return workCellRepository.save(workCellDb); + ConvertBean.serviceModelUpdate(workCell, AuthUtil.getSessionUser().getUserName()); + + insertWorkCellModule(workCell); + + return workCellRepository.save(workCell); } @Override @@ -598,4 +592,31 @@ public class ProdExtOrgService implements IProdExtOrgService { new Object[]{status, userName, TimeTool.getNowTime(true)}); } + private void insertWorkCellModule(MesWorkCell workCell) { + if (StringUtils.isEmpty(workCell.getGrade()) || workCell.getGrade().compareTo(MesExtEnumUtil.WORK_CELL_GRADE.SCAN.getValue()) != 0) return; + List workCellModuleList = getWorkCellModuleButtonList(workCell.getOrganizeCode(), workCell.getWorkCenterCode(), workCell.getWorkCellCode()); + if (!CollectionUtils.isEmpty(workCellModuleList)) return; + List workModuleList = getWorkModuleButtonList(workCell.getOrganizeCode()); + if (CollectionUtils.isEmpty(workModuleList)) return; + for (MesWorkModule workModule : workModuleList) { + if (null == workModule) continue; + MesWorkCellModule workCellModule = new MesWorkCellModule(); + BeanUtils.copyProperties(workCell, workCellModule, MesExtConstWords.ID); + workCellModule.setModuleCode(workModule.getModuleCode()); + workCellModuleRepository.insert(workCellModule); + } + } + + private List getWorkCellModuleButtonList(String organizeCode, String workCenterCode, String workCellCode) { + return workCellModuleRepository.findByProperty( + new String[]{MesExtConstWords.ORGANIZE_CODE, MesExtConstWords.IS_DELETED, MesExtConstWords.WORK_CENTER_CODE, MesExtConstWords.WORK_CELL_CODE}, + new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), workCenterCode, workCellCode}); + } + + private List getWorkModuleButtonList(String organizeCode) { + return workModuleRepository.findByProperty( + new String[]{MesExtConstWords.ORGANIZE_CODE, MesExtConstWords.IS_DELETED, MesExtConstWords.IS_VALID, MesExtConstWords.MODULE_TYPE}, + new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), MesEnumUtil.WORK_MODULE_TYPE.BUTTON_MODULE.getValue()}); + } + }