Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/ProduceSnExtService.java

@@ -810,7 +810,7 @@ public class ProduceSnExtService implements IProduceSnExtService {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("工单[%s]关联的物料号[%s]未维护成外制件", workOrder.getOrderNo(), workOrder.getPartNo())
+                    .setErrorDetail("工单[%s]关联的物料号[%s]基础信息物料分类2未维护成JX内制", workOrder.getOrderNo(), workOrder.getPartNo())
                     .build();
         }