From c11dea20a11b530bc338d1b22863f7fb69ebbf2c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 5 Jan 2024 10:59:13 +0800 Subject: [PATCH] =?UTF-8?q?jx=20mes=20=E7=94=9F=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/ProdOrgExtService.java | 1 + .../jx/JxCenterWorkingBoardCenterThreeService.java | 4 ++-- .../excel/bu3/SxWorkCenterExtExcelService.java | 27 ++++++++++++++++++++++ .../i3plus/ext/mes/pojo/model/SxProdOrgModel.java | 2 ++ 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/ProdOrgExtService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/ProdOrgExtService.java index 73d0826..91c7436 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/ProdOrgExtService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/ProdOrgExtService.java @@ -160,6 +160,7 @@ public class ProdOrgExtService implements IProdOrgExtService { workCenterExtDb.setPersonnelCost(workCenterExt.getPersonnelCost()); workCenterExtDb.setCategoryCode(workCenterExt.getCategoryCode()); workCenterExtDb.setCareerCode(workCenterExt.getCareerCode()); + workCenterExtDb.setWorkTakt(workCenterExt.getWorkTakt()); ConvertBean.serviceModelUpdate(workCenterExtDb, workCenterExt.getModifyUser()); new ConvertBeanExt(workCenterExtDb).convertBean(workCenterExtDb); return workCenterExtRepository.save(workCenterExtDb); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java index 84bf978..cc400fd 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java @@ -368,8 +368,8 @@ public class JxCenterWorkingBoardCenterThreeService extends JxCenterWorkingBoard } private String compareToTimeByFlag(String time, String curTime, boolean flag) { - if (flag ? time.compareTo(curTime) > 0 : time.compareTo(curTime) < 0) return curTime; - else return time; + if (flag ? time.compareTo(curTime) > 0 : time.compareTo(curTime) < 0) return time; + else return curTime; } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/bu3/SxWorkCenterExtExcelService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/bu3/SxWorkCenterExtExcelService.java index b4db2eb..c8b7dfe 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/bu3/SxWorkCenterExtExcelService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/bu3/SxWorkCenterExtExcelService.java @@ -240,6 +240,13 @@ public class SxWorkCenterExtExcelService implements IExcelImportExtService { } catch (Exception e) { } + //生产节拍 + String workTakt = null; + try { + workTakt = new DataFormatter().formatCellValue(row.getCell(15, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK)); + } catch (Exception e) { + } + //验证区域代码 if (CollectionUtils.isEmpty(areaDbMap) || !areaDbMap.containsKey(areaCode)) { errorNum ++; @@ -339,6 +346,26 @@ public class SxWorkCenterExtExcelService implements IExcelImportExtService { errorInfo += "第O列数据无效;"; } + if (!StringUtils.isEmpty(workTakt)) { + try { + if (MathOperation.compareTo(new Double(workTakt), new Double(0)) < 0) { + errorNum++; + cellNum += "P;"; + errorInfo += "第P列数据无效,必须是正数,最多两位小数;"; + } + String[] personnelCostArr = personnelCost.split(MesExtConstWords.DECIMAL_POINT); + if (null != personnelCostArr && personnelCostArr.length == 2 && personnelCostArr[1].length() > 2) { + errorNum++; + cellNum += "P;"; + errorInfo += "第P列数据无效,必须是正数,最多两位小数;"; + } + } catch (NumberFormatException e) { + errorNum++; + cellNum += "P;"; + errorInfo += "第P列数据无效,必须是正数,最多两位小数;"; + } + } + Boolean isExist = false; if (StringUtils.isEmpty(errorInfo)) { if (!existMap.containsKey(workCenterCode)) { diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/SxProdOrgModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/SxProdOrgModel.java index e10b8a9..dd086f9 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/SxProdOrgModel.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/SxProdOrgModel.java @@ -73,5 +73,7 @@ public class SxProdOrgModel extends BaseBean { private String categoryCode; @ApiParam("事业别") private String careerCode; + @ApiParam("生产节拍") + private Double workTakt; }