发送设备加工参数, 物料取值变更

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

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