From b73135f2d34e76369c2499ac3b6f04c234cbf002 Mon Sep 17 00:00:00 2001 From: yxw Date: Tue, 14 Nov 2023 10:46:09 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8D=95=E6=8D=AE=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD=E5=8E=9F=E5=9B=A0=E3=80=81?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=97=B6=E9=97=B4=E3=80=81=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BA=BA=E5=91=98=202=E3=80=81=E8=BF=94?= =?UTF-8?q?=E4=BF=AE=E5=A2=9E=E5=8A=A0=E7=BB=B4=E4=BF=AE=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=97=B6=E7=BB=B4=E4=BF=AE=E5=88=A4=E5=AE=9A=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA=E9=A1=B5=E9=9D=A2=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=EF=BC=8C=E6=B6=89=E5=8F=8A=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=EF=BC=9A=E4=BF=AE=E7=90=86=E5=93=81=E7=A5=A8?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=E3=80=81=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8=EF=BC=9B=EF=BC=88=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E4=B8=8D=E8=89=AF=E6=8A=A5=E8=A1=A8=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=A4=A7=EF=BC=8C?= =?UTF-8?q?=E6=9A=82=E4=B8=8D=E4=BF=AE=E6=94=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/jx/TorqueManageCheckDetailService.java | 2 +- .../busi/jx/TorqueManageCheckService.java | 20 ++++++++++---------- .../pojo/bean/MesProcessTorqueManageTaskDetail.java | 4 ++++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java index 7e5258e..7c40ba8 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java @@ -73,7 +73,7 @@ public class TorqueManageCheckDetailService implements ITorqueManageCheckService } // 前端未判断点检结果则后端进行判断 - if (torqueManageTaskDetail.getCheckResult() == null || torqueManageTaskDetail.getCheckResult() == 0) { + if ((torqueManageTaskDetail.getCheckResult() == null || torqueManageTaskDetail.getCheckResult() == 0) && "该项不需要点检".equals(torqueManageTaskDetail.getRemark())) { // 未维护上下限的情况 if (!StringUtils.isEmpty(torqueManageTaskDetail.getUpLimit()) && !StringUtils.isEmpty(torqueManageTaskDetail.getDownLimit())) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckService.java index 218ffda..b79dd76 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckService.java @@ -232,19 +232,19 @@ public class TorqueManageCheckService implements IWorkOrderStartService { StringJoiner key = new StringJoiner(MesPcnExtConstWords.COLON).add("MES-PAUSE-ORDER").add(workOrderExt.getOrderNo()); - String workCenterWoPauseKey = new StringJoiner(MesPcnExtConstWords.COLON).add("MES-PAUSE-ORDER").add(workOrderExt.getWorkCenterCode()).toString(); + //String workCenterWoPauseKey = new StringJoiner(MesPcnExtConstWords.COLON).add("MES-PAUSE-ORDER").add(workOrderExt.getWorkCenterCode()).toString(); //String workOrderNo = (String) redisMesPcn.getObject(workCenterWoPauseKey); - // - //String pauseOrderKey = (String) redisMesPcn.getObject(key); - //if (StringUtils.isEmpty(pauseOrderKey)) { - // msg = String.format("扭矩管理点检生成单据:工单[%s]在一分钟内有过暂停操作，操作频繁，等待一分钟后可再生成扭矩管理点检单", workOrderExt.getOrderNo()); - // log.info(msg); - // checkErrorLogService.insertCheckErrorLog(checkErrorLog, msg, userInfo); - // return true; - //} - // + String pauseOrderKey = (String) redisMesPcn.getObject(key); + + if (!StringUtils.isEmpty(pauseOrderKey) && pauseOrderKey.equals(workOrderExt.getOrderNo())) { + msg = String.format("扭矩管理点检生成单据:工单[%s]在一分钟内有过暂停操作，操作频繁，等待一分钟后可再生成扭矩管理点检单", workOrderExt.getOrderNo()); + log.info(msg); + checkErrorLogService.insertCheckErrorLog(checkErrorLog, msg, userInfo); + return true; + } + //if (!StringUtils.isEmpty(workOrderNo) && workOrderNo.equals(workOrderExt.getOrderNo())) { // // DdlPackBean packBean = DdlPackBean.getDdlPackBean(workOrderExt.getOrganizeCode()); diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProcessTorqueManageTaskDetail.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProcessTorqueManageTaskDetail.java index 6716940..c3a7f46 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProcessTorqueManageTaskDetail.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProcessTorqueManageTaskDetail.java @@ -215,4 +215,8 @@ public class MesProcessTorqueManageTaskDetail extends BaseBean implements Serial @ApiParam("全称扭矩螺丝刀-扭矩管理NO3") private String torqueManageNo3Full; + @Column(name = "REMARK") + @ApiParam(value = "备注") + public String remark; + }