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%":