From c4bdcd66d08fcc819effa4bb6d70116fb3635176 Mon Sep 17 00:00:00 2001 From: yxw Date: Tue, 5 Mar 2024 09:55:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=B8=8B=E8=BE=BE=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=BD=93=E5=89=8D=E5=B7=A5=E5=8D=95=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=B7=A5=E5=8D=95BOM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/base/ProcedureOnSiteService.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/ProcedureOnSiteService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/ProcedureOnSiteService.java index db2c144..be06cfe 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/ProcedureOnSiteService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/ProcedureOnSiteService.java @@ -208,10 +208,15 @@ public class ProcedureOnSiteService implements IProcedureOnSiteService { } BeanUtils.copyProperties(mesOnSiteOrderDetail, onSiteOrderDetail); - String updateMemoResult = updateOnSiteOrderDetailMemo(mesOnSiteOrderDetail, onSiteOrderDetail); - if (!StringUtils.isEmpty(updateMemoResult)) { - updateResultMap.put("UPDATE_MEMO_RESULT", updateMemoResult); + if ("该项不需要点检".equals(onSiteOrderDetail.getMemo())) { + onSiteOrderDetail.setCheckResult("OK"); + } else { + String updateMemoResult = updateOnSiteOrderDetailMemo(mesOnSiteOrderDetail, onSiteOrderDetail); + + if (!StringUtils.isEmpty(updateMemoResult)) { + updateResultMap.put("UPDATE_MEMO_RESULT", updateMemoResult); + } } onSiteOrderDetail.setSystemSyncStatus(MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());