From 48d268e2e19c33c247d1ba6631eee7ee02924a78 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 30 Aug 2024 09:10:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E8=AE=BE=E5=A4=87=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E5=8F=82=E6=95=B0,=20=E7=89=A9=E6=96=99=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/step/MesSendEquipParamsCmdStepService.java | 2 +- .../apiservice/serviceimpl/step/MesSendEquipParamsCmdStepService2.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendEquipParamsCmdStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendEquipParamsCmdStepService.java index 307957d..5e79f0f 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendEquipParamsCmdStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendEquipParamsCmdStepService.java @@ -242,7 +242,7 @@ public class MesSendEquipParamsCmdStepService extends BaseStepService { case "%CUSTORDERCOD%": return null != productionPartContext ? productionPartContext.getCustOrderNo() : null; case "%PARTNO%": - return null != productionPsOutContext ? productionPsOutContext.getPartNo() : null; + return null != productionPsOutContext ? productionPsOutContext.getPartNo() : (null != productionPartContext ? productionPartContext.getPartNo() : null); case "%VINCODE%": return null != productionPartContext ? productionPartContext.getVinCode() : null; case "%SEQUENCE%": diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendEquipParamsCmdStepService2.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendEquipParamsCmdStepService2.java index 2fefe14..39fd207 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendEquipParamsCmdStepService2.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesSendEquipParamsCmdStepService2.java @@ -242,7 +242,7 @@ public class MesSendEquipParamsCmdStepService2 extends BaseStepService { case "%CUSTORDERCOD%": return null != productionPartContext ? productionPartContext.getCustOrderNo() : null; case "%PARTNO%": - return null != productionPsOutContext ? productionPsOutContext.getPartNo() : null; + return null != productionPsOutContext ? productionPsOutContext.getPartNo() : (null != productionPartContext ? productionPartContext.getPartNo() : null); case "%VINCODE%": return null != productionPartContext ? productionPartContext.getVinCode() : null; case "%SEQUENCE%":